From patchwork Thu Dec 15 21:10:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 131739 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5868E1007D6 for ; Fri, 16 Dec 2011 08:11:06 +1100 (EST) Received: from localhost ([::1]:35375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbIZp-0002cb-O1 for incoming@patchwork.ozlabs.org; Thu, 15 Dec 2011 16:10:53 -0500 Received: from eggs.gnu.org ([140.186.70.92]:38551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbIZH-0001Yw-1H for qemu-devel@nongnu.org; Thu, 15 Dec 2011 16:10:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RbIZB-000485-IL for qemu-devel@nongnu.org; Thu, 15 Dec 2011 16:10:18 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:35876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbIZA-00047s-Vl for qemu-devel@nongnu.org; Thu, 15 Dec 2011 16:10:13 -0500 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp1-g21.free.fr (Postfix) with ESMTP id 541E8940410; Thu, 15 Dec 2011 22:10:07 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Thu, 15 Dec 2011 22:10:00 +0100 Message-Id: <1323983401-18345-11-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1323983401-18345-1-git-send-email-hpoussin@reactos.org> References: <1323983401-18345-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 212.27.42.1 Cc: Anthony Liguori , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH v3 10/11] isa: always use provided ISA bus in isa_bus_irqs() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Hervé Poussineau --- hw/isa-bus.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 3207680..5af790b 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -53,8 +53,10 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space_io) void isa_bus_irqs(ISABus *bus, qemu_irq *irqs) { - assert(!bus || bus == isabus); - isabus->irqs = irqs; + if (!bus) { + hw_error("Can't set isa irqs with no isa bus present."); + } + bus->irqs = irqs; } /*