From: Andreas Färber <afaerber@suse.de>
Date: Sun, 20 Jan 2013 17:56:18 +0000 (+0100)
Subject: isa: QOM'ify isa_bus_from_device()
X-Git-Tag: v1.4.0-rc0~45
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3e7b8f4e6f507e09e27b7449f3744596f19c0083;p=thirdparty%2Fqemu.git

isa: QOM'ify isa_bus_from_device()

DeviceState::parent_bus is document as private and should be accessed
through qdev_get_parent_bus(). Use a DEVICE() cast instead of accessing
ISADevice's qdev field directly. Use ISA_BUS() in place of DO_UPCAST().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/isa.h b/hw/isa.h
index 62e89d3bcdb..7a8874abfd3 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -82,7 +82,7 @@ void isa_register_portio_list(ISADevice *dev, uint16_t start,
 
 static inline ISABus *isa_bus_from_device(ISADevice *d)
 {
-    return DO_UPCAST(ISABus, qbus, d->qdev.parent_bus);
+    return ISA_BUS(qdev_get_parent_bus(DEVICE(d)));
 }
 
 extern hwaddr isa_mem_base;