fpu: rename softfloat-specialize.h -> .inc.c

[qemu.git] / device-hotplug.c

diff --git a/device-hotplug.c b/device-hotplug.c
index 3e5cdaad109e24daf5a14dac1a2945eb8778b079..f01d53774b062636aa81eaa13bd08af7ff46e87f 100644 (file)
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -23,17 +23,20 @@
  */
 
 #include "qemu/osdep.h"
  */
 
 #include "qemu/osdep.h"

-#include "hw/hw.h"

 #include "hw/boards.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "hw/boards.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"

+#include "qapi/qmp/qdict.h"
+#include "qapi/error.h"

 #include "qemu/config-file.h"
 #include "qemu/config-file.h"

+#include "qemu/option.h"

 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "block/block_int.h"
 
 static DriveInfo *add_init_drive(const char *optstr)
 {
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "block/block_int.h"
 
 static DriveInfo *add_init_drive(const char *optstr)
 {

+    Error *err = NULL;

     DriveInfo *dinfo;
     QemuOpts *opts;
     MachineClass *mc;
     DriveInfo *dinfo;
     QemuOpts *opts;
     MachineClass *mc;


@@ -43,8 +46,9 @@ static DriveInfo *add_init_drive(const char *optstr)
         return NULL;
 
     mc = MACHINE_GET_CLASS(current_machine);
         return NULL;
 
     mc = MACHINE_GET_CLASS(current_machine);

-    dinfo = drive_new(opts, mc->block_default_type);
-    if (!dinfo) {
+    dinfo = drive_new(opts, mc->block_default_type, &err);
+    if (err) {
+        error_report_err(err);

         qemu_opts_del(opts);
         return NULL;
     }
         qemu_opts_del(opts);
         return NULL;
     }


@@ -67,10 +71,6 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict)
     if (!dinfo) {
         goto err;
     }
     if (!dinfo) {
         goto err;
     }

-    if (dinfo->devaddr) {
-        monitor_printf(mon, "Parameter addr not supported\n");
-        goto err;
-    }

 
     switch (dinfo->type) {
     case IF_NONE:
 
     switch (dinfo->type) {
     case IF_NONE:


@@ -84,6 +84,8 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict)
 
 err:
     if (dinfo) {
 
 err:
     if (dinfo) {

-        blk_unref(blk_by_legacy_dinfo(dinfo));
+        BlockBackend *blk = blk_by_legacy_dinfo(dinfo);
+        monitor_remove_blk(blk);
+        blk_unref(blk);

     }
 }
     }
 }