tests/migration: Enable the migration test on s390x, too

[qemu.git] / device-hotplug.c

diff --git a/device-hotplug.c b/device-hotplug.c
index 3e5cdaad109e24daf5a14dac1a2945eb8778b079..cd427e2c764ca074efa243ce63a7ffae0faf7e73 100644 (file)
--- a/device-hotplug.c
+++ b/device-hotplug.c
@@ -27,7 +27,9 @@
 #include "hw/boards.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
+#include "qapi/qmp/qdict.h"
 #include "qemu/config-file.h"
+#include "qemu/option.h"
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "block/block_int.h"
@@ -67,10 +69,6 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict)
     if (!dinfo) {
         goto err;
     }
-    if (dinfo->devaddr) {
-        monitor_printf(mon, "Parameter addr not supported\n");
-        goto err;
-    }
 
     switch (dinfo->type) {
     case IF_NONE:
@@ -84,6 +82,8 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict)
 
 err:
     if (dinfo) {
-        blk_unref(blk_by_legacy_dinfo(dinfo));
+        BlockBackend *blk = blk_by_legacy_dinfo(dinfo);
+        monitor_remove_blk(blk);
+        blk_unref(blk);
     }
 }