External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-07-21 14:51:08 +02:00
parent 49b19bae56
commit f933745a49
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_block.c
View File

@ -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));

2
src/qemu/qemu_block.h
View File

@ -81,8 +81,6 @@ struct qemuBlockStorageSourceAttachData {
bool formatAttached;
char *driveCmd;
char *driveAlias;
bool driveAdded;
virDomainChrSourceDef *chardevDef;
char *chardevAlias;

3
src/qemu/qemu_command.c
View File

@ -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);