mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
qemu_snapshot: create: virDomainSnapshotGetCurrent is not used with redefine
Move it to code path for creating new snapshot. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
fe52bc2638
commit
5bd0c09570
@ -1702,7 +1702,6 @@ qemuSnapshotCreateXML(virDomainPtr domain,
|
|||||||
virQEMUDriver *driver = domain->conn->privateData;
|
virQEMUDriver *driver = domain->conn->privateData;
|
||||||
virDomainMomentObj *snap = NULL;
|
virDomainMomentObj *snap = NULL;
|
||||||
virDomainSnapshotPtr snapshot = NULL;
|
virDomainSnapshotPtr snapshot = NULL;
|
||||||
virDomainMomentObj *current = NULL;
|
|
||||||
bool update_current = true;
|
bool update_current = true;
|
||||||
bool redefine = flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE;
|
bool redefine = flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE;
|
||||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||||
@ -1766,6 +1765,8 @@ qemuSnapshotCreateXML(virDomainPtr domain,
|
|||||||
goto endjob;
|
goto endjob;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
virDomainMomentObj *current = NULL;
|
||||||
|
|
||||||
if (qemuSnapshotCreateAlignDisks(vm, def, driver, flags) < 0)
|
if (qemuSnapshotCreateAlignDisks(vm, def, driver, flags) < 0)
|
||||||
goto endjob;
|
goto endjob;
|
||||||
|
|
||||||
@ -1776,12 +1777,11 @@ qemuSnapshotCreateXML(virDomainPtr domain,
|
|||||||
goto endjob;
|
goto endjob;
|
||||||
|
|
||||||
def = NULL;
|
def = NULL;
|
||||||
}
|
|
||||||
|
|
||||||
current = virDomainSnapshotGetCurrent(vm->snapshots);
|
current = virDomainSnapshotGetCurrent(vm->snapshots);
|
||||||
if (current) {
|
if (current) {
|
||||||
if (!redefine)
|
|
||||||
snap->def->parent_name = g_strdup(current->def->name);
|
snap->def->parent_name = g_strdup(current->def->name);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* actually do the snapshot */
|
/* actually do the snapshot */
|
||||||
|
Loading…
Reference in New Issue
Block a user