From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAOdG-0006e9-IF for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RAOdE-0008E9-9F for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:14 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:33985) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAOdD-0008Di-J6 for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:12 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 2 Oct 2011 18:10:23 +0200 Message-Id: <1317571828-9059-12-git-send-email-hpoussin@reactos.org> In-Reply-To: <1317571828-9059-1-git-send-email-hpoussin@reactos.org> References: <1317571828-9059-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 v3 11/16] isa: use bus given in parameter to create device on specified ISA bus 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, 6 insertions(+), 4 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index ecc5375..cdfed29 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -151,11 +151,12 @@ ISADevice *isa_create(ISABus *bus, const char *name= ) { DeviceState *dev; =20 - 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); + assert(bus =3D=3D isabus); + dev =3D qdev_create(&bus->qbus, name); return DO_UPCAST(ISADevice, qdev, dev); } =20 @@ -163,11 +164,12 @@ ISADevice *isa_try_create(ISABus *bus, const char *= name) { DeviceState *dev; =20 - 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); + assert(bus =3D=3D isabus); + dev =3D qdev_try_create(&bus->qbus, name); return DO_UPCAST(ISADevice, qdev, dev); } =20 --=20 1.7.6.3