NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: driver: Remove pre-blockdev code paths from qemuDomainBlockPivot

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-20 13:09:21 +02:00
parent 50d1c5715b
commit cdfd84c71d
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/qemu/qemu_driver.c
View File

@ -14286,9 +14286,9 @@ qemuDomainBlockPivot(virDomainObj *vm,
g_autoptr(qemuBlockStorageSourceChainData) chainattachdata = NULL; g_autoptr(qemuBlockStorageSourceChainData) chainattachdata = NULL;
int ret = -1; int ret = -1;
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
g_autoptr(virJSONValue) bitmapactions = NULL; g_autoptr(virJSONValue) bitmapactions = NULL;
g_autoptr(virJSONValue) reopenactions = NULL; g_autoptr(virJSONValue) reopenactions = NULL;
int rc = 0;
if (job->state != QEMU_BLOCKJOB_STATE_READY) { if (job->state != QEMU_BLOCKJOB_STATE_READY) {
virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, virReportError(VIR_ERR_BLOCK_COPY_ACTIVE,
@ -14316,7 +14316,7 @@ qemuDomainBlockPivot(virDomainObj *vm,
return -1; return -1;
case QEMU_BLOCKJOB_TYPE_COPY: case QEMU_BLOCKJOB_TYPE_COPY:
if (blockdev && !job->jobflagsmissing) { if (!job->jobflagsmissing) {
bool shallow = job->jobflags & VIR_DOMAIN_BLOCK_COPY_SHALLOW; bool shallow = job->jobflags & VIR_DOMAIN_BLOCK_COPY_SHALLOW;
bool reuse = job->jobflags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT; bool reuse = job->jobflags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT;
@ -14353,41 +14353,35 @@ qemuDomainBlockPivot(virDomainObj *vm,
break; break;
case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT: case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
if (blockdev) { bitmapactions = virJSONValueNewArray();
bitmapactions = virJSONValueNewArray();
if (qemuMonitorTransactionBitmapAdd(bitmapactions, if (qemuMonitorTransactionBitmapAdd(bitmapactions,
job->data.commit.base->nodeformat, job->data.commit.base->nodeformat,
"libvirt-tmp-activewrite", "libvirt-tmp-activewrite",
false, false,
false, false,
0) < 0) 0) < 0)
return -1; return -1;
}
break; break;
} }
qemuDomainObjEnterMonitor(vm); qemuDomainObjEnterMonitor(vm);
if (blockdev) {
int rc = 0;
if (chainattachdata) { if (chainattachdata) {
if ((rc = qemuBlockStorageSourceChainAttach(priv->mon, chainattachdata)) == 0) { if ((rc = qemuBlockStorageSourceChainAttach(priv->mon, chainattachdata)) == 0) {
/* install backing images on success, or unplug them on failure */ /* install backing images on success, or unplug them on failure */
if ((rc = qemuMonitorTransaction(priv->mon, &reopenactions)) != 0) if ((rc = qemuMonitorTransaction(priv->mon, &reopenactions)) != 0)
qemuBlockStorageSourceChainDetach(priv->mon, chainattachdata); qemuBlockStorageSourceChainDetach(priv->mon, chainattachdata);
}
} }
if (bitmapactions && rc == 0)
ignore_value(qemuMonitorTransaction(priv->mon, &bitmapactions));
if (rc == 0)
ret = qemuMonitorJobComplete(priv->mon, job->name);
} else {
ret = qemuMonitorDrivePivot(priv->mon, job->name);
} }
if (bitmapactions && rc == 0)
ignore_value(qemuMonitorTransaction(priv->mon, &bitmapactions));
if (rc == 0)
ret = qemuMonitorJobComplete(priv->mon, job->name);
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitor(vm);
/* The pivot failed. The block job in QEMU remains in the synchronised state */ /* The pivot failed. The block job in QEMU remains in the synchronised state */