commit 3e7b8f4e6f507e09e27b7449f3744596f19c0083
author Andreas Färber <afaerber@suse.de> Sun Jan 20 18:56:18 2013 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Fri Feb 01 10:43:28 2013 -0600
tree 20f45f9b56c4e51c3677684f9ea1e43b4972c0b3
parent 8aae84a1f2ad256d222c97411af17013b1c35799

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>

hw/isa.h

diff --git a/hw/isa.h b/hw/isa.h
index 62e89d3..7a8874a 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -82,7 +82,7 @@
 
 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;