[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/trixie] 4 commits: gbp: Switch to trixie

[Andrea Bolognani (@abologna)]

Andrea Bolognani pushed to branch debian/trixie at Libvirt Packaging Team / libvirt


Commits:
b010941d by Andrea Bolognani at 2025-06-01T16:13:59+02:00
gbp: Switch to trixie

Gbp-Dch: Ignore

- - - - -
5853020d by Andrea Bolognani at 2025-06-01T16:14:52+02:00
salsa: Switch to trixie

Gbp-Dch: Ignore

- - - - -
eb4a97ac by Andrea Bolognani at 2025-06-01T16:39:19+02:00
patches: Add backports

Specifically

  * backport/qemuProcessStartWithMemoryState-Don-t-setup-qemu-for-inco.patch

Closes: #1104735

- - - - -
1e7a8b14 by Andrea Bolognani at 2025-06-01T17:04:46+02:00
Document changes and release 11.3.0-2

- - - - -


5 changed files:

- debian/changelog
- debian/gbp.conf
- + debian/patches/backport/qemuProcessStartWithMemoryState-Don-t-setup-qemu-for-inco.patch
- debian/patches/series
- debian/salsa-ci.yml


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libvirt (11.3.0-2) unstable; urgency=medium
+
+  * [eb4a97a] patches: Add backports
+    - backport/[...]-Don-t-setup-qemu-for-inco.patch
+      - Closes: #1104735
+
+ -- Andrea Bolognani <eof at kiyuko.org>  Sun, 01 Jun 2025 16:39:44 +0200
+
 libvirt (11.3.0-1) unstable; urgency=medium
 
   * [228f666] New upstream version 11.3.0


=====================================
debian/gbp.conf
=====================================
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = upstream/latest
-debian-branch = debian/latest
+debian-branch = debian/trixie
 pristine-tar = True
 upstream-signatures = on
 


=====================================
debian/patches/backport/qemuProcessStartWithMemoryState-Don-t-setup-qemu-for-inco.patch
=====================================
@@ -0,0 +1,62 @@
+From: Peter Krempa <pkrempa at redhat.com>
+Date: Tue, 13 May 2025 19:07:20 +0200
+Subject: qemuProcessStartWithMemoryState: Don't setup qemu for incoming
+ migration when reverting internal snapshot
+
+The memory/device state of the VM for an internal snapshot is restored
+by qemu itself via a QMP command and is taken from the qcow2 image, thus
+we don't actually do any form of incoming migration.
+
+Commit 5b324c0a739fe00 which refactored the setup of the incoming
+migration state didn't take the above into account and inadvertently
+caused that qemu is being started with '-incoming defer' also when
+libvirt would want to revert an internal snapshot.
+
+Now when qemu expects incoming migration it doesn't activate the block
+backends as that would cause locking problems and image inconsistency,
+but also doesn't allow the use of the images. Since the block backends
+are not activated qemu then thinks that they don't actually support
+internal snapshots and reports:
+
+  error: operation failed: load of internal snapshot 'foo1' job failed: Device 'libvirt-1-format' is writable but does not support snapshots
+
+Due to the above bug it's not possible to revert to internal snapshots
+in libvirt-11.2 and libvirt-11.3.
+
+Fixes: 5b324c0a739fe00cbec209219db4488742492112
+Resolves: https://issues.redhat.com/browse/RHEL-88747
+Closes: https://gitlab.com/libvirt/libvirt/-/issues/771
+Signed-off-by: Peter Krempa <pkrempa at redhat.com>
+Reviewed-by: Jim Fehlig <jfehlig at suse.com>
+Reviewed-by: Michal Privoznik <mprivozn at redhat.com>
+(cherry picked from commit 889d2ae289cd95d612575ebc7a4e111ac33b0939)
+
+Bug-Debian: https://bugs.debian.org/1104735
+
+Forwarded: not-needed
+Origin: https://gitlab.com/libvirt/libvirt/-/commits/889d2ae289cd95d612575ebc7a4e111ac33b0939
+---
+ src/qemu/qemu_process.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 1af91c5..5f2203d 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -8636,9 +8636,13 @@ qemuProcessStartWithMemoryState(virConnectPtr conn,
+     /* The fd passed to qemuProcessIncomingDefNew is used to create the migration
+      * URI, so it must be called after starting the decompression program.
+      */
+-    incoming = qemuProcessIncomingDefNew(driver, vm, NULL, "stdio", fd, path, data, migParams);
+-    if (!incoming)
+-        return -1;
++    if (!snapshot) {
++        /* Internal snapshots are reverted by a QMP command after qemu is started,
++         * so we don't actually want to setup incoming migration. */
++        if (!(incoming = qemuProcessIncomingDefNew(driver, vm, NULL, "stdio",
++                                                   fd, path, data, migParams)))
++            return -1;
++    }
+ 
+     /* No cookie means libvirt which saved the domain was too old to mess up
+      * the CPU definitions.


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
+backport/qemuProcessStartWithMemoryState-Don-t-setup-qemu-for-inco.patch
 debian/Debianize-libvirt-guests.patch
 debian/apparmor_profiles_local_include.patch
 debian/Use-sensible-editor-by-default.patch


=====================================
debian/salsa-ci.yml
=====================================
@@ -6,6 +6,7 @@ include:
 # be flaky. Don't waste precious CI minutes until it passes consistently
 variables:
   SALSA_CI_DISABLE_REPROTEST: 1
+  RELEASE: "trixie"
 
 verify-wrap-and-sort:
   image: debian:unstable



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/7976814b1c7e24013ace51fe91d6a33aa4656d6c...1e7a8b14024661f6cfbaa590deeb6c7c2aca9325

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/7976814b1c7e24013ace51fe91d6a33aa4656d6c...1e7a8b14024661f6cfbaa590deeb6c7c2aca9325
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20250602/5c875111/attachment-0001.htm>