From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIQyS-00023r-JG for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIQyK-0001ZC-PQ for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:15 -0400 Received: from smtp23.services.sfr.fr ([93.17.128.19]:58026) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIQyK-0001Yc-Hd for qemu-devel@nongnu.org; Mon, 24 Oct 2011 16:18:12 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 24 Oct 2011 22:18:23 +0200 Message-Id: <1319487505-5915-10-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 09/11] isa: always use provided ISA bus when creating an isa device 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 | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 7c94f0b..3207680 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -130,12 +130,11 @@ ISADevice *isa_create(ISABus *bus, const char *name= ) { DeviceState *dev; =20 - assert(!bus || bus =3D=3D isabus); - if (!isabus) { + if (!bus) { hw_error("Tried to create isa device %s with no isa bus present.= ", name); } - dev =3D qdev_create(&isabus->qbus, name); + dev =3D qdev_create(&bus->qbus, name); return DO_UPCAST(ISADevice, qdev, dev); } =20 @@ -143,12 +142,11 @@ ISADevice *isa_try_create(ISABus *bus, const char *= name) { DeviceState *dev; =20 - assert(!bus || bus =3D=3D isabus); - if (!isabus) { + if (!bus) { hw_error("Tried to create isa device %s with no isa bus present.= ", name); } - dev =3D qdev_try_create(&isabus->qbus, name); + dev =3D qdev_try_create(&bus->qbus, name); return DO_UPCAST(ISADevice, qdev, dev); } =20 --=20 1.7.6.3