From: Hervé Poussineau <hpoussin@reactos.org>
Date: Thu, 15 Dec 2011 21:09:59 +0000 (+0100)
Subject: isa: always use provided ISA bus when creating an isa device
X-Git-Tag: qemu-xen-4.3.0-rc1~1833
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=75782268d682828e1ebbaa1cfaf63ecde50dad54;p=qemu-upstream-4.4-testing.git

isa: always use provided ISA bus when creating an isa device

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 7c94f0b7b..320768036 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;
 
-    assert(!bus || bus == isabus);
-    if (!isabus) {
+    if (!bus) {
         hw_error("Tried to create isa device %s with no isa bus present.",
                  name);
     }
-    dev = qdev_create(&isabus->qbus, name);
+    dev = qdev_create(&bus->qbus, name);
     return DO_UPCAST(ISADevice, qdev, dev);
 }
 
@@ -143,12 +142,11 @@ ISADevice *isa_try_create(ISABus *bus, const char *name)
 {
     DeviceState *dev;
 
-    assert(!bus || bus == isabus);
-    if (!isabus) {
+    if (!bus) {
         hw_error("Tried to create isa device %s with no isa bus present.",
                  name);
     }
-    dev = qdev_try_create(&isabus->qbus, name);
+    dev = qdev_try_create(&bus->qbus, name);
     return DO_UPCAST(ISADevice, qdev, dev);
 }