Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging

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

diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c
index a3fe99ea7733ed1f455858d0f632cba15b86ad72..8b2ed7a492f4f719ab947bcabd131f718c78269a 100644 (file)
--- a/hw/device-hotplug.c
+++ b/hw/device-hotplug.c
@@ -25,20 +25,18 @@
 #include "hw.h"
 #include "boards.h"
 #include "net.h"
-#include "block_int.h"
-#include "sysemu.h"
+#include "blockdev.h"
 
 DriveInfo *add_init_drive(const char *optstr)
 {
-    int fatal_error;
     DriveInfo *dinfo;
     QemuOpts *opts;
 
-    opts = drive_add(NULL, "%s", optstr);
+    opts = drive_def(optstr);
     if (!opts)
         return NULL;
 
-    dinfo = drive_init(opts, current_machine->use_scsi, &fatal_error);
+    dinfo = drive_init(opts, current_machine->use_scsi);
     if (!dinfo) {
         qemu_opts_del(opts);
         return NULL;