From 5bd0c095705ef6c2ef1531daf8e981efec82f6b5 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Thu, 25 Nov 2021 15:59:42 +0100 Subject: [PATCH] qemu_snapshot: create: virDomainSnapshotGetCurrent is not used with redefine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move it to code path for creating new snapshot. Signed-off-by: Pavel Hrdina Reviewed-by: Ján Tomko --- src/qemu/qemu_snapshot.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index abcee30116..f0bddea803 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1702,7 +1702,6 @@ qemuSnapshotCreateXML(virDomainPtr domain, virQEMUDriver *driver = domain->conn->privateData; virDomainMomentObj *snap = NULL; virDomainSnapshotPtr snapshot = NULL; - virDomainMomentObj *current = NULL; bool update_current = true; bool redefine = flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); @@ -1766,6 +1765,8 @@ qemuSnapshotCreateXML(virDomainPtr domain, goto endjob; } } else { + virDomainMomentObj *current = NULL; + if (qemuSnapshotCreateAlignDisks(vm, def, driver, flags) < 0) goto endjob; @@ -1776,12 +1777,11 @@ qemuSnapshotCreateXML(virDomainPtr domain, goto endjob; def = NULL; - } - current = virDomainSnapshotGetCurrent(vm->snapshots); - if (current) { - if (!redefine) + current = virDomainSnapshotGetCurrent(vm->snapshots); + if (current) { snap->def->parent_name = g_strdup(current->def->name); + } } /* actually do the snapshot */