Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2020-12-21 12:35:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt" Mon Dec 21 12:35:01 2020 rev:320 rq:856765 version:6.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2020-12-09 22:12:33.931136631 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new.5145/libvirt.changes 2020-12-21 12:35:08.370926641 +0100 @@ -1,0 +2,7 @@ +Thu Dec 17 04:20:58 UTC 2020 - James Fehlig <jfehlig@suse.com> + +- qemu: Fix logic bug in inactive snapshot deletion + 0ddebdb4-qemu-snapshot-deletion.patch + boo#1180049 + +------------------------------------------------------------------- New: ---- 0ddebdb4-qemu-snapshot-deletion.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.WEZ1iH/_old 2020-12-21 12:35:09.694929805 +0100 +++ /var/tmp/diff_new_pack.WEZ1iH/_new 2020-12-21 12:35:09.702929824 +0100 @@ -293,6 +293,7 @@ # Upstream patches Patch0: 0d05d51b-apparmor-lxc-fix.patch Patch1: cf4e7e62-lxc-def-secmodel.patch +Patch2: 0ddebdb4-qemu-snapshot-deletion.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++ 0ddebdb4-qemu-snapshot-deletion.patch ++++++ commit 0ddebdb42e72a984d25793722a60b85c7c7d8f1f Author: Peter Krempa <pkrempa@redhat.com> Date: Wed Dec 9 10:08:53 2020 +0100 qemu: Fix logic bug in inactive snapshot deletion Commit 926563dc3a6 which refactored the function call deleting the snapshot's on disk state introduced a logic bug, which skips over the deletion of libvirt metadata after the disk state deletion is done. To fix it we must not return early. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/109 Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com> Index: libvirt-6.10.0/src/qemu/qemu_domain.c =================================================================== --- libvirt-6.10.0.orig/src/qemu/qemu_domain.c +++ libvirt-6.10.0/src/qemu/qemu_domain.c @@ -6594,7 +6594,8 @@ qemuDomainSnapshotDiscard(virQEMUDriverP if (!def) def = vm->def; - return qemuDomainSnapshotForEachQcow2(driver, def, snap, "-d", true); + if (qemuDomainSnapshotForEachQcow2(driver, def, snap, "-d", true) < 0) + return -1; } else { priv = vm->privateData; qemuDomainObjEnterMonitor(driver, vm);