Merge remote-tracking branch 'sstabellini/xen-2013-04-05' into staging

[qemu.git] / hw / pci / pci-hotplug.c

diff --git a/hw/pci/pci-hotplug.c b/hw/pci/pci-hotplug.c
index e5e8a7ab58dc7b4cb879a51ee551d83290177de0..180ee07fefc74496bbb4b413f873dc9f24bff2c9 100644 (file)
--- a/hw/pci/pci-hotplug.c
+++ b/hw/pci/pci-hotplug.c
@@ -30,8 +30,8 @@
 #include "monitor/monitor.h"
 #include "hw/scsi.h"
 #include "hw/virtio-blk.h"
-#include "qemu-config.h"
-#include "blockdev.h"
+#include "qemu/config-file.h"
+#include "sysemu/blockdev.h"
 #include "qapi/error.h"
 
 #if defined(TARGET_I386)
@@ -99,7 +99,7 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter,
     dinfo->unit = qemu_opt_get_number(dinfo->opts, "unit", -1);
     dinfo->bus = scsibus->busnr;
     scsidev = scsi_bus_legacy_add_drive(scsibus, dinfo->bdrv, dinfo->unit,
-                                        false, -1);
+                                        false, -1, NULL);
     if (!scsidev) {
         return -1;
     }