From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:60293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Raxqi-0008TZ-TL for qemu-devel@nongnu.org; Wed, 14 Dec 2011 18:02:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Raxqg-0006V8-RS for qemu-devel@nongnu.org; Wed, 14 Dec 2011 18:02:56 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:51528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Raxqg-0006Ul-3B for qemu-devel@nongnu.org; Wed, 14 Dec 2011 18:02:54 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Thu, 15 Dec 2011 00:02:42 +0100 Message-Id: <1323903763-22933-11-git-send-email-hpoussin@reactos.org> In-Reply-To: <1323903763-22933-1-git-send-email-hpoussin@reactos.org> References: <1323903763-22933-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 10/11] isa: always use provided ISA bus in isa_bus_irqs() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 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 *ad= dress_space_io) =20 void isa_bus_irqs(ISABus *bus, qemu_irq *irqs) { - assert(!bus || bus =3D=3D isabus); - isabus->irqs =3D irqs; + if (!bus) { + hw_error("Can't set isa irqs with no isa bus present."); + } + bus->irqs =3D irqs; } =20 /* --=20 1.7.7.3