qemu: block: Remove support for legacy disk hotplug/unplug

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 88d3aff3109a6c03027711b089a33873ea3589c0..b82e3311e1539d0ba6eb3d2ae0b6a857d54ce8b4 100644 (file)
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -1304,7 +1304,6 @@ qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachData *data)
     g_free(data->encryptsecretAlias);
     g_free(data->httpcookiesecretAlias);
     g_free(data->driveCmd);
-    g_free(data->driveAlias);
     g_free(data->chardevAlias);
     g_free(data);
 }
@@ -1472,13 +1471,6 @@ qemuBlockStorageSourceAttachApply(qemuMonitor *mon,
         qemuBlockStorageSourceAttachApplyFormat(mon, data) < 0)
         return -1;
 
-    if (data->driveCmd) {
-        if (qemuMonitorAddDrive(mon, data->driveCmd) < 0)
-            return -1;
-
-        data->driveAdded = true;
-    }
-
     if (data->chardevDef) {
         if (qemuMonitorAttachCharDev(mon, data->chardevAlias, data->chardevDef) < 0)
             return -1;
@@ -1515,12 +1507,6 @@ qemuBlockStorageSourceAttachRollback(qemuMonitor *mon,
         }
     }
 
-    if (data->driveAdded) {
-        if (qemuMonitorDriveDel(mon, data->driveAlias) < 0)
-            VIR_WARN("Unable to remove drive %s (%s) after failed 'device_add'",
-                     data->driveAlias, data->driveCmd);
-    }
-
     if (data->formatAttached)
         ignore_value(qemuMonitorBlockdevDel(mon, data->formatNodeName));
 

diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index 3ca19b2a91252e4741beb9a1e346f07d9b07f1eb..8a3a10344ec7fc08741d3be4294dba837f09ab8e 100644 (file)
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -81,8 +81,6 @@ struct qemuBlockStorageSourceAttachData {
     bool formatAttached;
 
     char *driveCmd;
-    char *driveAlias;
-    bool driveAdded;
 
     virDomainChrSourceDef *chardevDef;
     char *chardevAlias;

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index e2d2997fca47538e348562e299f918a2be329382..75325a4da67a97eec70b750f827a55c7ee814638 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10663,8 +10663,7 @@ qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDef *disk)
 
     data = g_new0(qemuBlockStorageSourceAttachData, 1);
 
-    if (!(data->driveCmd = qemuBuildDriveStr(disk)) ||
-        !(data->driveAlias = qemuAliasDiskDriveFromDisk(disk)))
+    if (!(data->driveCmd = qemuBuildDriveStr(disk)))
         return NULL;
 
     return g_steal_pointer(&data);