Merge remote-tracking branch 'luiz/queue/qmp' into staging

[qemu.git] / hw / empty_slot.c

diff --git a/hw/empty_slot.c b/hw/empty_slot.c
index 3cb6ccb27d911621d7391a2b32782d8d2f75344d..5234a4ddc6cbe558333d09cc950049ade1cfd1b8 100644 (file)
--- a/hw/empty_slot.c
+++ b/hw/empty_slot.c
@@ -9,9 +9,9 @@
  * version.
  */
 
-#include "hw.h"
-#include "sysbus.h"
-#include "empty_slot.h"
+#include "hw/hw.h"
+#include "hw/sysbus.h"
+#include "hw/empty_slot.h"
 
 //#define DEBUG_EMPTY_SLOT
 
@@ -56,7 +56,7 @@ void empty_slot_init(hwaddr addr, uint64_t slot_size)
         EmptySlot *e;
 
         dev = qdev_create(NULL, "empty_slot");
-        s = sysbus_from_qdev(dev);
+        s = SYS_BUS_DEVICE(dev);
         e = FROM_SYSBUS(EmptySlot, s);
         e->size = slot_size;