External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: snapshot: Always save config XML after qemuDomainSnapshotCreateDiskActive

Browse Source 
If there's an offline config definition save it unconditionally even if
it was not modified.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-06-05 14:06:56 +02:00
parent 999e450c26
commit 9678503088
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_driver.c
View File

@ -15157,13 +15157,11 @@ qemuDomainSnapshotUpdateDiskSourcesRenumber(virStorageSourcePtr src)
/** /**
* qemuDomainSnapshotUpdateDiskSources: * qemuDomainSnapshotUpdateDiskSources:
* @dd: snapshot disk data object * @dd: snapshot disk data object
* @persist: set to true if persistent config of the VM was changed
* *
* Updates disk definition after a successful snapshot. * Updates disk definition after a successful snapshot.
*/ */
static void static void
qemuDomainSnapshotUpdateDiskSources(qemuDomainSnapshotDiskDataPtr dd, qemuDomainSnapshotUpdateDiskSources(qemuDomainSnapshotDiskDataPtr dd)
bool *persist)
{ {
if (!dd->src) if (!dd->src)
return; return;
@ -15185,7 +15183,6 @@ qemuDomainSnapshotUpdateDiskSources(qemuDomainSnapshotDiskDataPtr dd,
if (dd->persistdisk) { if (dd->persistdisk) {
VIR_STEAL_PTR(dd->persistsrc->backingStore, dd->persistdisk->src); VIR_STEAL_PTR(dd->persistsrc->backingStore, dd->persistdisk->src);
VIR_STEAL_PTR(dd->persistdisk->src, dd->persistsrc); VIR_STEAL_PTR(dd->persistdisk->src, dd->persistsrc);
*persist = true;
} }
} }
@ -15234,7 +15231,6 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
bool do_transaction = false; bool do_transaction = false;
int ret = 0; int ret = 0;
size_t i; size_t i;
bool persist = false;
bool reuse = (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0; bool reuse = (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0;
qemuDomainSnapshotDiskDataPtr diskdata = NULL; qemuDomainSnapshotDiskDataPtr diskdata = NULL;
virErrorPtr orig_err = NULL; virErrorPtr orig_err = NULL;
@ -15287,7 +15283,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
virDomainAuditDisk(vm, dd->disk->src, dd->src, "snapshot", ret >= 0); virDomainAuditDisk(vm, dd->disk->src, dd->src, "snapshot", ret >= 0);
if (ret == 0) if (ret == 0)
qemuDomainSnapshotUpdateDiskSources(dd, &persist); qemuDomainSnapshotUpdateDiskSources(dd);
} }
if (ret < 0) if (ret < 0)
@ -15328,7 +15324,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
} }
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0 || if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0 ||
(persist && virDomainSaveConfig(cfg->configDir, driver->caps, (vm->newDef && virDomainSaveConfig(cfg->configDir, driver->caps,
vm->newDef) < 0)) vm->newDef) < 0))
ret = -1; ret = -1;