From d9c7985b4f95de24bf7fa1e6d82a85a514b87a84 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Wed, 29 Sep 2021 19:02:39 +0200 Subject: [PATCH] qemu_snapshot: create: drop update_current variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no need for the extra variable as it is used only at one place. Signed-off-by: Pavel Hrdina Reviewed-by: Ján Tomko --- src/qemu/qemu_snapshot.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index f0bddea803..980c6e855e 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; - bool update_current = true; bool redefine = flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(virDomainSnapshotDef) def = NULL; @@ -1725,10 +1724,6 @@ qemuSnapshotCreateXML(virDomainPtr domain, VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE, NULL); - if ((redefine && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT)) || - (flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) - update_current = false; - if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) return NULL; @@ -1823,7 +1818,7 @@ qemuSnapshotCreateXML(virDomainPtr domain, endjob: if (snapshot && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) { - if (update_current) + if (!redefine || (flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT)) qemuSnapshotSetCurrent(vm, snap); if (qemuDomainSnapshotWriteMetadata(vm, snap,