mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
qemuDomainAttachDiskGeneric: Move 'copy-on-read' handling to qemuBlockStorageSourceChainData
Fill in the required fields in qemuBlockStorageSourceChainData to handle the hotplug so that we can simplify the cleanup code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
parent
0ad33f48c5
commit
c63a3ba258
@ -700,9 +700,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver,
|
|||||||
qemuDomainObjPrivate *priv = vm->privateData;
|
qemuDomainObjPrivate *priv = vm->privateData;
|
||||||
g_autofree char *devstr = NULL;
|
g_autofree char *devstr = NULL;
|
||||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||||
g_autoptr(virJSONValue) corProps = NULL;
|
|
||||||
g_autofree char *corAlias = NULL;
|
|
||||||
bool corAdded = false;
|
|
||||||
bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
|
bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
|
||||||
|
|
||||||
if (qemuDomainStorageSourceChainAccessAllow(driver, vm, disk->src) < 0)
|
if (qemuDomainStorageSourceChainAccessAllow(driver, vm, disk->src) < 0)
|
||||||
@ -718,16 +715,17 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver,
|
|||||||
if (!(data = qemuBuildStorageSourceChainAttachPrepareChardev(disk)))
|
if (!(data = qemuBuildStorageSourceChainAttachPrepareChardev(disk)))
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
} else if (blockdev) {
|
} else if (blockdev) {
|
||||||
if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON) {
|
|
||||||
if (!(corProps = qemuBlockStorageGetCopyOnReadProps(disk)))
|
|
||||||
goto cleanup;
|
|
||||||
|
|
||||||
corAlias = g_strdup(QEMU_DOMAIN_DISK_PRIVATE(disk)->nodeCopyOnRead);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(disk->src,
|
if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(disk->src,
|
||||||
priv->qemuCaps)))
|
priv->qemuCaps)))
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
|
if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON) {
|
||||||
|
if (!(data->copyOnReadProps = qemuBlockStorageGetCopyOnReadProps(disk)))
|
||||||
|
goto cleanup;
|
||||||
|
|
||||||
|
data->copyOnReadNodename = g_strdup(QEMU_DOMAIN_DISK_PRIVATE(disk)->nodeCopyOnRead);
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if (!(data = qemuBuildStorageSourceChainAttachPrepareDrive(disk,
|
if (!(data = qemuBuildStorageSourceChainAttachPrepareDrive(disk,
|
||||||
priv->qemuCaps)))
|
priv->qemuCaps)))
|
||||||
@ -746,13 +744,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver,
|
|||||||
if (qemuBlockStorageSourceChainAttach(priv->mon, data) < 0)
|
if (qemuBlockStorageSourceChainAttach(priv->mon, data) < 0)
|
||||||
goto exit_monitor;
|
goto exit_monitor;
|
||||||
|
|
||||||
if (corProps) {
|
|
||||||
if (qemuMonitorBlockdevAdd(priv->mon, &corProps) < 0)
|
|
||||||
goto exit_monitor;
|
|
||||||
|
|
||||||
corAdded = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (qemuDomainAttachExtensionDevice(priv->mon, &disk->info) < 0)
|
if (qemuDomainAttachExtensionDevice(priv->mon, &disk->info) < 0)
|
||||||
goto exit_monitor;
|
goto exit_monitor;
|
||||||
|
|
||||||
@ -793,8 +784,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver,
|
|||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
exit_monitor:
|
exit_monitor:
|
||||||
if (corAdded)
|
|
||||||
ignore_value(qemuMonitorBlockdevDel(priv->mon, corAlias));
|
|
||||||
qemuBlockStorageSourceChainDetach(priv->mon, data);
|
qemuBlockStorageSourceChainDetach(priv->mon, data);
|
||||||
|
|
||||||
if (qemuDomainObjExitMonitor(driver, vm) < 0)
|
if (qemuDomainObjExitMonitor(driver, vm) < 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user