From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIQyc-0002Uv-Ty for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIQyL-0001ZP-LA for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:16 -0400 Received: from smtp23.services.sfr.fr ([93.17.128.19]:58040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIQyL-0001Yi-7D for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:13 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 24 Oct 2011 22:18:24 +0200 Message-Id: <1319487505-5915-11-git-send-email-hpoussin@reactos.org> In-Reply-To: <1319487505-5915-1-git-send-email-hpoussin@reactos.org> References: <1319487505-5915-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: =?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.6.3