pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 856706 from home:jfehlig:branches:Virtualization

Browse Source 
- qemu: Fix logic bug in inactive snapshot deletion
  0ddebdb4-qemu-snapshot-deletion.patch
  boo#1180049

OBS-URL: https://build.opensuse.org/request/show/856706
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=866
This commit is contained in:
James Fehlig 2020-12-17 15:20:10 +00:00 committed by Git OBS Bridge
parent 2a51407f2d
commit 267982bde3
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0ddebdb4-qemu-snapshot-deletion.patch Normal file
View File

@ -0,0 +1,30 @@
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);

7
libvirt.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Dec 9 00:07:16 UTC 2020 - James Fehlig <jfehlig@suse.com>

1
libvirt.spec
View File

@ -293,6 +293,7 @@ Source100: %{name}-rpmlintrc
# 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