Add Vitastor support

2024-08-02 17:32:55 +03:00
108 changed files with 3351 additions and 4867 deletions
--- a/2
+++ b/2
@@ -58,7 +58,7 @@ $(BUILDDIR): submodule
 deb kvm: $(DEBS)
 $(DEB_DBG): $(DEB)
 $(DEB): $(BUILDDIR)
-	cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
+	cd $(BUILDDIR); dpkg-buildpackage -b -us -uc -j32
 	lintian $(DEBS)

 sbuild: $(DSC)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,97 +1,8 @@
-pve-qemu-kvm (9.2.0-6) bookworm; urgency=medium
+pve-qemu-kvm (9.0.2-1+vitastor1) bookworm; urgency=medium

-  * gluster: provide more context for deprecation warning.
+  * Add Vitastor support

- -- Proxmox Support Team <support@proxmox.com>  Wed, 02 Jul 2025 12:30:27 +0200
-
-pve-qemu-kvm (9.2.0-5) bookworm; urgency=medium
-
-  * pve backup: backup-access api: simplify bitmap logic
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 04 Apr 2025 16:15:58 +0200
-
-pve-qemu-kvm (9.2.0-4) bookworm; urgency=medium
-
-  * various async snapshot improvements, inclduing using a dedicated IO thread
-    for the state file when doing a live snapshot. That should reduce load on
-    the main thread and for it to get stuck on IO, i.e. same benefits as using
-    a dedicated IO thread for regular drives. This is particularly interesting
-    when the VM state storage is a network storage like NFS. It should also
-    address #6262.
-
-  * pve backup: implement basic features and API in preperation for external
-    backup provider storage plugins.
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 03 Apr 2025 17:00:34 +0200
-
-pve-qemu-kvm (9.2.0-3) bookworm; urgency=medium
-
-  * revert changes to the High Precision Event Timer (HPET) to fix performance
-    regression
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 26 Mar 2025 09:56:01 +0100
-
-pve-qemu-kvm (9.2.0-2) bookworm; urgency=medium
-
-  * fix assertion failure when migrating a VM with multiple disks on a
-    replicated ZFS.
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 24 Feb 2025 17:33:34 +0100
-
-pve-qemu-kvm (9.2.0-1) bookworm; urgency=medium
-
-  * update submodule and patches to QEMU 9.2.0
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 04 Feb 2025 08:49:20 +0100
-
-pve-qemu-kvm (9.1.2-3) bookworm; urgency=medium
-
-  * async snapshot: explicitly specify raw format when loading the VM state
-    file
-
-  * vma create: rework CLI parameters for passing disk to a more structured
-    style and use that to allow explicitly specifying the format
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 24 Jan 2025 16:12:34 +0100
-
-pve-qemu-kvm (9.1.2-2) bookworm; urgency=medium
-
-  * adapt machine version deprecation for Proxmox VE release and support
-    cycle.
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 17 Jan 2025 16:34:06 +0100
-
-pve-qemu-kvm (9.1.2-1) bookworm; urgency=medium
-
-  * update submodule and patches to QEMU 9.1.2
-
-  * improve error handling and edge cases with fleecing backups.
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 11 Dec 2024 16:47:21 +0100
-
-pve-qemu-kvm (9.0.2-4) bookworm; urgency=medium
-
-  * async snapshot: ensure any dynamic vCPU-throttling applied for
-    auto-converge gets always disabled again after finishing the snapshot.
-
- -- Proxmox Support Team <support@proxmox.com>  Sun, 10 Nov 2024 11:23:09 +0100
-
-pve-qemu-kvm (9.0.2-3) bookworm; urgency=medium
-
-  * pick up fix for VirtIO PCI regressions
-
-  * pick up stable fixes for 9.0, including fixes for VirtIO-net, ARM and
-    x86(_64) emulation, CVEs to harden NBD server against malicious clients,
-    as well as a few others (VNC, physmem, Intel IOMMU, ...).
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 06 Sep 2024 16:21:42 +0200
-
-pve-qemu-kvm (9.0.2-2) bookworm; urgency=medium
-
-  * actually update submodule to QEMU 9.0.2. The previous release was still
-    based on 9.0.0 by mistake.
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 07 Aug 2024 10:16:01 +0200
+ -- Vitaliy Filippov <vitalif@yourcmc.ru>  Fri, 02 Aug 2024 00:03:15 +0300

 pve-qemu-kvm (9.0.2-1) bookworm; urgency=medium

--- a/debian/control
+++ b/debian/control
@@ -59,6 +59,7 @@ Depends: ceph-common (>= 0.48),
         libspice-server1 (>= 0.14.0~),
         libusb-1.0-0 (>= 1.0.17-1),
         libusbredirparser1 (>= 0.6-2),
+         vitastor-client (>= 0.9.4),
         libuuid1,
         ${misc:Depends},
         ${shlibs:Depends},
--- a/debian/patches/bitmap-mirror/0001-drive-mirror-add-support-for-sync-bitmap-mode-never.patch
+++ b/debian/patches/bitmap-mirror/0001-drive-mirror-add-support-for-sync-bitmap-mode-never.patch
@@ -27,7 +27,7 @@ Signed-off-by: Ma Haocong <mahaocong@didichuxing.com>
 Signed-off-by: John Snow <jsnow@redhat.com>
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-[FE: rebased for 9.1.2]
+[FE: rebased for 8.2.2]
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
 block/mirror.c                         | 99 ++++++++++++++++++++------
@@ -38,7 +38,7 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 5 files changed, 142 insertions(+), 28 deletions(-)

 diff --git a/block/mirror.c b/block/mirror.c
-index 2afe700b4d..c3d4be9b15 100644
+index 1bdce3b657..0c5c72df2e 100644
 --- a/block/mirror.c
 +++ b/block/mirror.c
@@ -51,7 +51,7 @@ typedef struct MirrorBlockJob {
@@ -59,7 +59,7 @@ index 2afe700b4d..c3d4be9b15 100644
     BdrvDirtyBitmap *dirty_bitmap;
     BdrvDirtyBitmapIter *dbi;
     uint8_t *buf;
-@@ -723,7 +725,8 @@ static int mirror_exit_common(Job *job)
+@@ -722,7 +724,8 @@ static int mirror_exit_common(Job *job)
                              &error_abort);
 
     if (!abort && s->backing_mode == MIRROR_SOURCE_BACKING_CHAIN) {
@@ -69,7 +69,7 @@ index 2afe700b4d..c3d4be9b15 100644
         BlockDriverState *unfiltered_target = bdrv_skip_filters(target_bs);
 
         if (bdrv_cow_bs(unfiltered_target) != backing) {
-@@ -824,6 +827,16 @@ static void mirror_abort(Job *job)
+@@ -819,6 +822,16 @@ static void mirror_abort(Job *job)
     assert(ret == 0);
 }
 
@@ -86,7 +86,7 @@ index 2afe700b4d..c3d4be9b15 100644
 static void coroutine_fn mirror_throttle(MirrorBlockJob *s)
 {
     int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
-@@ -1020,7 +1033,8 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
+@@ -1015,7 +1028,8 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
     mirror_free_init(s);
 
     s->last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
@@ -96,7 +96,7 @@ index 2afe700b4d..c3d4be9b15 100644
         ret = mirror_dirty_init(s);
         if (ret < 0 || job_is_cancelled(&s->common.job)) {
             goto immediate_exit;
-@@ -1309,6 +1323,7 @@ static const BlockJobDriver mirror_job_driver = {
+@@ -1304,6 +1318,7 @@ static const BlockJobDriver mirror_job_driver = {
         .run                    = mirror_run,
         .prepare                = mirror_prepare,
         .abort                  = mirror_abort,
@@ -104,7 +104,7 @@ index 2afe700b4d..c3d4be9b15 100644
         .pause                  = mirror_pause,
         .complete               = mirror_complete,
         .cancel                 = mirror_cancel,
-@@ -1327,6 +1342,7 @@ static const BlockJobDriver commit_active_job_driver = {
+@@ -1322,6 +1337,7 @@ static const BlockJobDriver commit_active_job_driver = {
         .run                    = mirror_run,
         .prepare                = mirror_prepare,
         .abort                  = mirror_abort,
@@ -112,7 +112,7 @@ index 2afe700b4d..c3d4be9b15 100644
         .pause                  = mirror_pause,
         .complete               = mirror_complete,
         .cancel                 = commit_active_cancel,
-@@ -1719,7 +1735,10 @@ static BlockJob *mirror_start_job(
+@@ -1714,7 +1730,10 @@ static BlockJob *mirror_start_job(
                              BlockCompletionFunc *cb,
                              void *opaque,
                              const BlockJobDriver *driver,
@@ -123,8 +123,8 @@ index 2afe700b4d..c3d4be9b15 100644
 +                             BlockDriverState *base,
                              bool auto_complete, const char *filter_node_name,
                              bool is_mirror, MirrorCopyMode copy_mode,
-                              bool base_ro,
-@@ -1734,10 +1753,39 @@ static BlockJob *mirror_start_job(
+                              Error **errp)
+@@ -1728,10 +1747,39 @@ static BlockJob *mirror_start_job(
 
     GLOBAL_STATE_CODE();
 
@@ -166,7 +166,7 @@ index 2afe700b4d..c3d4be9b15 100644
     assert(is_power_of_2(granularity));
 
     if (buf_size < 0) {
-@@ -1878,7 +1926,9 @@ static BlockJob *mirror_start_job(
+@@ -1871,7 +1919,9 @@ static BlockJob *mirror_start_job(
     s->replaces = g_strdup(replaces);
     s->on_source_error = on_source_error;
     s->on_target_error = on_target_error;
@@ -177,7 +177,7 @@ index 2afe700b4d..c3d4be9b15 100644
     s->backing_mode = backing_mode;
     s->zero_target = zero_target;
     qatomic_set(&s->copy_mode, copy_mode);
-@@ -1904,6 +1954,18 @@ static BlockJob *mirror_start_job(
+@@ -1897,6 +1947,18 @@ static BlockJob *mirror_start_job(
      */
     bdrv_disable_dirty_bitmap(s->dirty_bitmap);
 
@@ -196,7 +196,7 @@ index 2afe700b4d..c3d4be9b15 100644
     bdrv_graph_wrlock();
     ret = block_job_add_bdrv(&s->common, "source", bs, 0,
                              BLK_PERM_WRITE_UNCHANGED | BLK_PERM_WRITE |
-@@ -1986,6 +2048,9 @@ fail:
+@@ -1979,6 +2041,9 @@ fail:
         if (s->dirty_bitmap) {
             bdrv_release_dirty_bitmap(s->dirty_bitmap);
         }
@@ -206,7 +206,7 @@ index 2afe700b4d..c3d4be9b15 100644
         job_early_fail(&s->common.job);
     }
 
-@@ -2008,35 +2073,28 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
+@@ -2001,35 +2066,28 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
                   BlockDriverState *target, const char *replaces,
                   int creation_flags, int64_t speed,
                   uint32_t granularity, int64_t buf_size,
@@ -241,13 +241,13 @@ index 2afe700b4d..c3d4be9b15 100644
                      speed, granularity, buf_size, backing_mode, zero_target,
                      on_source_error, on_target_error, unmap, NULL, NULL,
 -                     &mirror_job_driver, is_none_mode, base, false,
-                     filter_node_name, true, copy_mode, false, errp);
+-                     filter_node_name, true, copy_mode, errp);
 +                     &mirror_job_driver, mode, bitmap, bitmap_mode, base,
-+                     false, filter_node_name, true, copy_mode, false, errp);
+                     false, filter_node_name, true, copy_mode, errp);
 }
 
 BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs,
-@@ -2063,7 +2121,8 @@ BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs,
+@@ -2056,7 +2114,8 @@ BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs,
                      job_id, bs, creation_flags, base, NULL, speed, 0, 0,
                      MIRROR_LEAVE_BACKING_CHAIN, false,
                      on_error, on_error, true, cb, opaque,
@@ -255,13 +255,13 @@ index 2afe700b4d..c3d4be9b15 100644
 +                     &commit_active_job_driver, MIRROR_SYNC_MODE_FULL,
 +                     NULL, 0, base, auto_complete,
                      filter_node_name, false, MIRROR_COPY_MODE_BACKGROUND,
-                      base_read_only, errp);
+                      errp);
     if (!job) {
 diff --git a/blockdev.c b/blockdev.c
-index 6740663fda..38fa63155c 100644
+index 4c33c3f5f0..f3e508a6a7 100644
 --- a/blockdev.c
 +++ b/blockdev.c
-@@ -2781,6 +2781,9 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
+@@ -2776,6 +2776,9 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
                                    BlockDriverState *target,
                                    const char *replaces,
                                    enum MirrorSyncMode sync,
@@ -271,7 +271,7 @@ index 6740663fda..38fa63155c 100644
                                    BlockMirrorBackingMode backing_mode,
                                    bool zero_target,
                                    bool has_speed, int64_t speed,
-@@ -2799,6 +2802,7 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
+@@ -2794,6 +2797,7 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
 {
     BlockDriverState *unfiltered_bs;
     int job_flags = JOB_DEFAULT;
@@ -279,7 +279,7 @@ index 6740663fda..38fa63155c 100644
 
     GLOBAL_STATE_CODE();
     GRAPH_RDLOCK_GUARD_MAINLOOP();
-@@ -2853,6 +2857,29 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
+@@ -2848,6 +2852,29 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
         sync = MIRROR_SYNC_MODE_FULL;
     }
 
@@ -309,7 +309,7 @@ index 6740663fda..38fa63155c 100644
     if (!replaces) {
         /* We want to mirror from @bs, but keep implicit filters on top */
         unfiltered_bs = bdrv_skip_implicit_filters(bs);
-@@ -2894,8 +2921,8 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
+@@ -2889,8 +2916,8 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
      * and will allow to check whether the node still exist at mirror completion
      */
     mirror_start(job_id, bs, target,
@@ -320,7 +320,7 @@ index 6740663fda..38fa63155c 100644
                  on_source_error, on_target_error, unmap, filter_node_name,
                  copy_mode, errp);
 }
-@@ -3039,6 +3066,8 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
+@@ -3034,6 +3061,8 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
 
     blockdev_mirror_common(arg->job_id, bs, target_bs,
                            arg->replaces, arg->sync,
@@ -329,7 +329,7 @@ index 6740663fda..38fa63155c 100644
                            backing_mode, zero_target,
                            arg->has_speed, arg->speed,
                            arg->has_granularity, arg->granularity,
-@@ -3058,6 +3087,8 @@ void qmp_blockdev_mirror(const char *job_id,
+@@ -3053,6 +3082,8 @@ void qmp_blockdev_mirror(const char *job_id,
                          const char *device, const char *target,
                          const char *replaces,
                          MirrorSyncMode sync,
@@ -338,7 +338,7 @@ index 6740663fda..38fa63155c 100644
                          bool has_speed, int64_t speed,
                          bool has_granularity, uint32_t granularity,
                          bool has_buf_size, int64_t buf_size,
-@@ -3098,7 +3129,8 @@ void qmp_blockdev_mirror(const char *job_id,
+@@ -3093,7 +3124,8 @@ void qmp_blockdev_mirror(const char *job_id,
     }
 
     blockdev_mirror_common(job_id, bs, target_bs,
@@ -364,10 +364,10 @@ index eb2d92a226..f0c642b194 100644
                   BlockdevOnError on_source_error,
                   BlockdevOnError on_target_error,
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index fd3bcc1c17..48ba32049f 100644
+index b179d65520..905da8be72 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -2178,6 +2178,15 @@
+@@ -2174,6 +2174,15 @@
 #     destination (all the disk, only the sectors allocated in the
 #     topmost image, or only new I/O).
 #
@@ -383,7 +383,7 @@ index fd3bcc1c17..48ba32049f 100644
 # @granularity: granularity of the dirty bitmap, default is 64K if the
 #     image format doesn't have clusters, 4K if the clusters are
 #     smaller than that, else the cluster size.  Must be a power of 2
-@@ -2220,7 +2229,9 @@
+@@ -2216,7 +2225,9 @@
 { 'struct': 'DriveMirror',
   'data': { '*job-id': 'str', 'device': 'str', 'target': 'str',
             '*format': 'str', '*node-name': 'str', '*replaces': 'str',
@@ -394,7 +394,7 @@ index fd3bcc1c17..48ba32049f 100644
             '*speed': 'int', '*granularity': 'uint32',
             '*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
             '*on-target-error': 'BlockdevOnError',
-@@ -2499,6 +2510,15 @@
+@@ -2496,6 +2507,15 @@
 #     destination (all the disk, only the sectors allocated in the
 #     topmost image, or only new I/O).
 #
@@ -410,7 +410,7 @@ index fd3bcc1c17..48ba32049f 100644
 # @granularity: granularity of the dirty bitmap, default is 64K if the
 #     image format doesn't have clusters, 4K if the clusters are
 #     smaller than that, else the cluster size.  Must be a power of 2
-@@ -2547,7 +2567,8 @@
+@@ -2544,7 +2564,8 @@
 { 'command': 'blockdev-mirror',
   'data': { '*job-id': 'str', 'device': 'str', 'target': 'str',
             '*replaces': 'str',
@@ -421,7 +421,7 @@ index fd3bcc1c17..48ba32049f 100644
             '*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
             '*on-target-error': 'BlockdevOnError',
 diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c
-index 20ed54f570..4f50a99334 100644
+index 3766d5de6b..afa44cbd34 100644
 --- a/tests/unit/test-block-iothread.c
 +++ b/tests/unit/test-block-iothread.c
@@ -755,8 +755,8 @@ static void test_propagate_mirror(void)
--- a/debian/patches/bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch
+++ b/debian/patches/bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch
@@ -24,10 +24,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 18 insertions(+), 6 deletions(-)

 diff --git a/block/mirror.c b/block/mirror.c
-index c3d4be9b15..7b6f7c0068 100644
+index 0c5c72df2e..37fee3fa25 100644
 --- a/block/mirror.c
 +++ b/block/mirror.c
-@@ -694,8 +694,6 @@ static int mirror_exit_common(Job *job)
+@@ -693,8 +693,6 @@ static int mirror_exit_common(Job *job)
         bdrv_unfreeze_backing_chain(mirror_top_bs, target_bs);
     }
 
@@ -36,7 +36,7 @@ index c3d4be9b15..7b6f7c0068 100644
     /* Make sure that the source BDS doesn't go away during bdrv_replace_node,
      * before we can call bdrv_drained_end */
     bdrv_ref(src);
-@@ -805,6 +803,18 @@ static int mirror_exit_common(Job *job)
+@@ -800,6 +798,18 @@ static int mirror_exit_common(Job *job)
     bdrv_drained_end(target_bs);
     bdrv_unref(target_bs);
 
@@ -55,7 +55,7 @@ index c3d4be9b15..7b6f7c0068 100644
     bs_opaque->job = NULL;
 
     bdrv_drained_end(src);
-@@ -1763,10 +1773,6 @@ static BlockJob *mirror_start_job(
+@@ -1757,10 +1767,6 @@ static BlockJob *mirror_start_job(
                        " sync mode",
                        MirrorSyncMode_str(sync_mode));
             return NULL;
@@ -66,7 +66,7 @@ index c3d4be9b15..7b6f7c0068 100644
         }
     } else if (bitmap) {
         error_setg(errp,
-@@ -1783,6 +1789,12 @@ static BlockJob *mirror_start_job(
+@@ -1777,6 +1783,12 @@ static BlockJob *mirror_start_job(
             return NULL;
         }
         granularity = bdrv_dirty_bitmap_granularity(bitmap);
--- a/debian/patches/bitmap-mirror/0003-mirror-add-check-for-bitmap-mode-without-bitmap.patch
+++ b/debian/patches/bitmap-mirror/0003-mirror-add-check-for-bitmap-mode-without-bitmap.patch
@@ -16,10 +16,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 3 insertions(+)

 diff --git a/blockdev.c b/blockdev.c
-index 38fa63155c..204cf6fad1 100644
+index f3e508a6a7..37b8437f3e 100644
 --- a/blockdev.c
 +++ b/blockdev.c
-@@ -2878,6 +2878,9 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
+@@ -2873,6 +2873,9 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
         if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_ALLOW_RO, errp)) {
             return;
         }
--- a/debian/patches/bitmap-mirror/0004-mirror-switch-to-bdrv_dirty_bitmap_merge_internal.patch
+++ b/debian/patches/bitmap-mirror/0004-mirror-switch-to-bdrv_dirty_bitmap_merge_internal.patch
@@ -16,10 +16,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 4 insertions(+), 7 deletions(-)

 diff --git a/block/mirror.c b/block/mirror.c
-index 7b6f7c0068..2b1c07095d 100644
+index 37fee3fa25..6b3cce1007 100644
 --- a/block/mirror.c
 +++ b/block/mirror.c
-@@ -809,8 +809,8 @@ static int mirror_exit_common(Job *job)
+@@ -804,8 +804,8 @@ static int mirror_exit_common(Job *job)
              job->ret == 0 && ret == 0)) {
             /* Success; synchronize copy back to sync. */
             bdrv_clear_dirty_bitmap(s->sync_bitmap, NULL);
@@ -30,7 +30,7 @@ index 7b6f7c0068..2b1c07095d 100644
         }
     }
     bdrv_release_dirty_bitmap(s->dirty_bitmap);
-@@ -1971,11 +1971,8 @@ static BlockJob *mirror_start_job(
+@@ -1964,11 +1964,8 @@ static BlockJob *mirror_start_job(
     }
 
     if (s->sync_mode == MIRROR_SYNC_MODE_BITMAP) {
--- a/debian/patches/bitmap-mirror/0006-mirror-move-some-checks-to-qmp.patch
+++ b/debian/patches/bitmap-mirror/0006-mirror-move-some-checks-to-qmp.patch
@@ -21,10 +21,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 3 files changed, 70 insertions(+), 59 deletions(-)

 diff --git a/block/mirror.c b/block/mirror.c
-index 2b1c07095d..f5787b380c 100644
+index 6b3cce1007..2f1223852b 100644
 --- a/block/mirror.c
 +++ b/block/mirror.c
-@@ -1763,31 +1763,13 @@ static BlockJob *mirror_start_job(
+@@ -1757,31 +1757,13 @@ static BlockJob *mirror_start_job(
 
     GLOBAL_STATE_CODE();
 
@@ -62,10 +62,10 @@ index 2b1c07095d..f5787b380c 100644
 
         if (bitmap_mode != BITMAP_SYNC_MODE_NEVER) {
 diff --git a/blockdev.c b/blockdev.c
-index 204cf6fad1..79d47b1920 100644
+index 37b8437f3e..ed8198f351 100644
 --- a/blockdev.c
 +++ b/blockdev.c
-@@ -2857,7 +2857,36 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
+@@ -2852,7 +2852,36 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
         sync = MIRROR_SYNC_MODE_FULL;
     }
 
--- a/debian/patches/extra/0001-monitor-qmp-fix-race-with-clients-disconnecting-earl.patch
+++ b/debian/patches/extra/0001-monitor-qmp-fix-race-with-clients-disconnecting-earl.patch
@@ -48,7 +48,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 6 files changed, 59 insertions(+), 5 deletions(-)

 diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
-index c3740ec616..7f38ce6b8b 100644
+index 965f5d5450..e04bd059b6 100644
 --- a/include/monitor/monitor.h
 +++ b/include/monitor/monitor.h
@@ -16,6 +16,7 @@ extern QemuOptsList qemu_mon_opts;
@@ -60,7 +60,7 @@ index c3740ec616..7f38ce6b8b 100644
 void monitor_init_globals(void);
 void monitor_init_globals_core(void);
 diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h
-index cb628f681d..93dbd62fc2 100644
+index 252de85681..8db28f9272 100644
 --- a/monitor/monitor-internal.h
 +++ b/monitor/monitor-internal.h
@@ -151,6 +151,13 @@ typedef struct {
@@ -78,10 +78,10 @@ index cb628f681d..93dbd62fc2 100644
 
 /**
 diff --git a/monitor/monitor.c b/monitor/monitor.c
-index 56786c0ccc..30071d0c8a 100644
+index 01ede1babd..5681bca346 100644
 --- a/monitor/monitor.c
 +++ b/monitor/monitor.c
-@@ -116,6 +116,21 @@ bool monitor_cur_is_qmp(void)
+@@ -117,6 +117,21 @@ bool monitor_cur_is_qmp(void)
     return cur_mon && monitor_is_qmp(cur_mon);
 }
 
@@ -104,7 +104,7 @@ index 56786c0ccc..30071d0c8a 100644
  * Is @mon is using readline?
  * Note: not all HMP monitors use readline, e.g., gdbserver has a
 diff --git a/monitor/qmp.c b/monitor/qmp.c
-index 5e538f34c0..eb181d5979 100644
+index a239945e8d..589c9524f8 100644
 --- a/monitor/qmp.c
 +++ b/monitor/qmp.c
@@ -165,6 +165,8 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req)
@@ -189,7 +189,7 @@ index 176b549473..790bb7d1da 100644
         aio_bh_schedule_oneshot(iohandler_get_aio_context(), do_qmp_dispatch_bh,
                                 &data);
 diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c
-index 1894cdfe1f..d74d0459f0 100644
+index afa477aae6..d3ff124bf3 100644
 --- a/stubs/monitor-core.c
 +++ b/stubs/monitor-core.c
@@ -12,6 +12,11 @@ Monitor *monitor_set_cur(Coroutine *co, Monitor *mon)
@@ -201,6 +201,6 @@ index 1894cdfe1f..d74d0459f0 100644
 +    return -1;
 +}
 +
- void qapi_event_emit(QAPIEvent event, QDict *qdict)
+ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
 {
 }
--- a/debian/patches/extra/0002-scsi-megasas-Internal-cdbs-have-16-byte-length.patch
+++ b/debian/patches/extra/0002-scsi-megasas-Internal-cdbs-have-16-byte-length.patch
@@ -0,0 +1,69 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Tue, 28 Feb 2023 09:11:29 -0800
+Subject: [PATCH] scsi: megasas: Internal cdbs have 16-byte length
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Host drivers do not necessarily set cdb_len in megasas io commands.
+With commits 6d1511cea0 ("scsi: Reject commands if the CDB length
+exceeds buf_len") and fe9d8927e2 ("scsi: Add buf_len parameter to
+scsi_req_new()"), this results in failures to boot Linux from affected
+SCSI drives because cdb_len is set to 0 by the host driver.
+Set the cdb length to its actual size to solve the problem.
+
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+(picked-up from https://lists.nongnu.org/archive/html/qemu-devel/2023-02/msg08653.html)
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ hw/scsi/megasas.c | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
+index 2d0c607177..97e51733af 100644
+--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
+@@ -1781,7 +1781,7 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
+     uint8_t cdb[16];
+     int len;
+     struct SCSIDevice *sdev = NULL;
+-    int target_id, lun_id, cdb_len;
+    int target_id, lun_id;
+ 
+     lba_count = le32_to_cpu(cmd->frame->io.header.data_len);
+     lba_start_lo = le32_to_cpu(cmd->frame->io.lba_lo);
+@@ -1790,7 +1790,6 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
+ 
+     target_id = cmd->frame->header.target_id;
+     lun_id = cmd->frame->header.lun_id;
+-    cdb_len = cmd->frame->header.cdb_len;
+ 
+     if (target_id < MFI_MAX_LD && lun_id == 0) {
+         sdev = scsi_device_find(&s->bus, 0, target_id, lun_id);
+@@ -1805,15 +1804,6 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
+         return MFI_STAT_DEVICE_NOT_FOUND;
+     }
+ 
+-    if (cdb_len > 16) {
+-        trace_megasas_scsi_invalid_cdb_len(
+-            mfi_frame_desc(frame_cmd), 1, target_id, lun_id, cdb_len);
+-        megasas_write_sense(cmd, SENSE_CODE(INVALID_OPCODE));
+-        cmd->frame->header.scsi_status = CHECK_CONDITION;
+-        s->event_count++;
+-        return MFI_STAT_SCSI_DONE_WITH_ERROR;
+-    }
+-
+     cmd->iov_size = lba_count * sdev->blocksize;
+     if (megasas_map_sgl(s, cmd, &cmd->frame->io.sgl)) {
+         megasas_write_sense(cmd, SENSE_CODE(TARGET_FAILURE));
+@@ -1824,7 +1814,7 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
+ 
+     megasas_encode_lba(cdb, lba_start, lba_count, is_write);
+     cmd->req = scsi_req_new(sdev, cmd->index,
+-                            lun_id, cdb, cdb_len, cmd);
+                            lun_id, cdb, sizeof(cdb), cmd);
+     if (!cmd->req) {
+         trace_megasas_scsi_req_alloc_failed(
+             mfi_frame_desc(frame_cmd), target_id, lun_id);
--- a/debian/patches/extra/0003-ide-avoid-potential-deadlock-when-draining-during-tr.patch
+++ b/debian/patches/extra/0003-ide-avoid-potential-deadlock-when-draining-during-tr.patch
@@ -55,7 +55,7 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 1 file changed, 6 insertions(+), 6 deletions(-)

 diff --git a/hw/ide/core.c b/hw/ide/core.c
-index 08d9218455..20d8c0cf66 100644
+index e8cb2dac92..3b21acf651 100644
 --- a/hw/ide/core.c
 +++ b/hw/ide/core.c
@@ -456,7 +456,7 @@ static void ide_trim_bh_cb(void *opaque)
--- a/debian/patches/extra/0003-tcg-Reset-free_temps-before-tcg_optimize.patch
+++ b/debian/patches/extra/0003-tcg-Reset-free_temps-before-tcg_optimize.patch
@@ -1,82 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Richard Henderson <richard.henderson@linaro.org>
-Date: Sat, 7 Dec 2024 18:14:45 +0000
-Subject: [PATCH] tcg: Reset free_temps before tcg_optimize
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When allocating new temps during tcg_optmize, do not re-use
-any EBB temps that were used within the TB.  We do not have
-any idea what span of the TB in which the temp was live.
-
-Introduce tcg_temp_ebb_reset_freed and use before tcg_optimize,
-as well as replacing the equivalent in plugin_gen_inject and
-tcg_func_start.
-
-Cc: qemu-stable@nongnu.org
-Fixes: fb04ab7ddd8 ("tcg/optimize: Lower TCG_COND_TST{EQ,NE} if unsupported")
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2711
-Reported-by: wannacu <wannacu2049@gmail.com>
-Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-(cherry picked from commit 04e006ab36a8565b92d4e21dd346367fbade7d74)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- accel/tcg/plugin-gen.c          | 2 +-
- include/tcg/tcg-temp-internal.h | 6 ++++++
- tcg/tcg.c                       | 5 ++++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
-index 0f47bfbb48..1ef075552c 100644
--- a/accel/tcg/plugin-gen.c
-+++ b/accel/tcg/plugin-gen.c
-@@ -275,7 +275,7 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb)
-      * that might be live within the existing opcode stream.
-      * The simplest solution is to release them all and create new.
-      */
-    memset(tcg_ctx->free_temps, 0, sizeof(tcg_ctx->free_temps));
-+    tcg_temp_ebb_reset_freed(tcg_ctx);
- 
-     QTAILQ_FOREACH_SAFE(op, &tcg_ctx->ops, link, next) {
-         switch (op->opc) {
-diff --git a/include/tcg/tcg-temp-internal.h b/include/tcg/tcg-temp-internal.h
-index 44192c55a9..98f91e68b7 100644
--- a/include/tcg/tcg-temp-internal.h
-+++ b/include/tcg/tcg-temp-internal.h
-@@ -42,4 +42,10 @@ TCGv_i64 tcg_temp_ebb_new_i64(void);
- TCGv_ptr tcg_temp_ebb_new_ptr(void);
- TCGv_i128 tcg_temp_ebb_new_i128(void);
- 
-+/* Forget all freed EBB temps, so that new allocations produce new temps. */
-+static inline void tcg_temp_ebb_reset_freed(TCGContext *s)
-+{
-+    memset(s->free_temps, 0, sizeof(s->free_temps));
-+}
-+
- #endif /* TCG_TEMP_FREE_H */
-diff --git a/tcg/tcg.c b/tcg/tcg.c
-index 0babae1b88..4578b185be 100644
--- a/tcg/tcg.c
-+++ b/tcg/tcg.c
-@@ -1489,7 +1489,7 @@ void tcg_func_start(TCGContext *s)
-     s->nb_temps = s->nb_globals;
- 
-     /* No temps have been previously allocated for size or locality.  */
-    memset(s->free_temps, 0, sizeof(s->free_temps));
-+    tcg_temp_ebb_reset_freed(s);
- 
-     /* No constant temps have been previously allocated. */
-     for (int i = 0; i < TCG_TYPE_COUNT; ++i) {
-@@ -6120,6 +6120,9 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb, uint64_t pc_start)
-     }
- #endif
- 
-+    /* Do not reuse any EBB that may be allocated within the TB. */
-+    tcg_temp_ebb_reset_freed(s);
-+
-     tcg_optimize(s);
- 
-     reachable_code_pass(s);
--- a/debian/patches/extra/0004-Revert-x86-acpi-workaround-Windows-not-handling-name.patch
+++ b/debian/patches/extra/0004-Revert-x86-acpi-workaround-Windows-not-handling-name.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fiona Ebner <f.ebner@proxmox.com>
+Date: Fri, 17 Nov 2023 11:18:06 +0100
+Subject: [PATCH] Revert "x86: acpi: workaround Windows not handling name
+ references in Package properly"
+
+This reverts commit 44d975ef340e2f21f236f9520c53e1b30d2213a4.
+
+As reported in the community forum [0] and reproduced locally this
+breaks VirtIO network adapters in (at least) the German ISO of Windows
+Server 2022. The fix itself was for
+
+> Issue is not fatal but as result acpi-index/"PCI Label ID" property
+> is either not shown in device details page or shows incorrect value.
+
+so revert and tolerate that as a stop-gap, rather than have the
+devices not working at all.
+
+[0]: https://forum.proxmox.com/threads/92094/post-605684
+
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ hw/i386/acpi-build.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
+index 53f804ac16..9b1b9f0412 100644
+--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
+@@ -347,13 +347,9 @@ Aml *aml_pci_device_dsm(void)
+     {
+         Aml *params = aml_local(0);
+         Aml *pkg = aml_package(2);
+-        aml_append(pkg, aml_int(0));
+-        aml_append(pkg, aml_int(0));
+        aml_append(pkg, aml_name("BSEL"));
+        aml_append(pkg, aml_name("ASUN"));
+         aml_append(method, aml_store(pkg, params));
+-        aml_append(method,
+-            aml_store(aml_name("BSEL"), aml_index(params, aml_int(0))));
+-        aml_append(method,
+-            aml_store(aml_name("ASUN"), aml_index(params, aml_int(1))));
+         aml_append(method,
+             aml_return(aml_call5("PDSM", aml_arg(0), aml_arg(1),
+                                  aml_arg(2), aml_arg(3), params))
--- a/debian/patches/extra/0004-target-i386-Reset-TSCs-of-parked-vCPUs-too-on-VM-res.patch
+++ b/debian/patches/extra/0004-target-i386-Reset-TSCs-of-parked-vCPUs-too-on-VM-res.patch
@@ -1,149 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>
-Date: Thu, 12 Dec 2024 15:51:15 +0100
-Subject: [PATCH] target/i386: Reset TSCs of parked vCPUs too on VM reset
-
-Since commit 5286c3662294 ("target/i386: properly reset TSC on reset")
-QEMU writes the special value of "1" to each online vCPU TSC on VM reset
-to reset it.
-
-However parked vCPUs don't get that handling and due to that their TSCs
-get desynchronized when the VM gets reset.
-This in turn causes KVM to turn off PVCLOCK_TSC_STABLE_BIT in its exported
-PV clock.
-Note that KVM has no understanding of vCPU being currently parked.
-
-Without PVCLOCK_TSC_STABLE_BIT the sched clock is marked unstable in
-the guest's kvm_sched_clock_init().
-This causes a performance regressions to show in some tests.
-
-Fix this issue by writing the special value of "1" also to TSCs of parked
-vCPUs on VM reset.
-
-Reproducing the issue:
-1) Boot a VM with "-smp 2,maxcpus=3" or similar
-
-2) device_add host-x86_64-cpu,id=vcpu,node-id=0,socket-id=0,core-id=2,thread-id=0
-
-3) Wait a few seconds
-
-4) device_del vcpu
-
-5) Inside the VM run:
-# echo "t" >/proc/sysrq-trigger; dmesg | grep sched_clock_stable
-Observe the sched_clock_stable() value is 1.
-
-6) Reboot the VM
-
-7) Once the VM boots once again run inside it:
-# echo "t" >/proc/sysrq-trigger; dmesg | grep sched_clock_stable
-Observe the sched_clock_stable() value is now 0.
-
-Fixes: 5286c3662294 ("target/i386: properly reset TSC on reset")
-Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
-Link: https://lore.kernel.org/r/5a605a88e9a231386dc803c60f5fed9b48108139.1734014926.git.maciej.szmigiero@oracle.com
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit 3f2a05b31ee9ce2ddb6c75a9bc3f5e7f7af9a76f)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- accel/kvm/kvm-all.c                | 11 +++++++++++
- configs/targets/i386-softmmu.mak   |  1 +
- configs/targets/x86_64-softmmu.mak |  1 +
- include/sysemu/kvm.h               |  8 ++++++++
- target/i386/kvm/kvm.c              | 15 +++++++++++++++
- 5 files changed, 36 insertions(+)
-
-diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
-index 801cff16a5..dec1d1c16a 100644
--- a/accel/kvm/kvm-all.c
-+++ b/accel/kvm/kvm-all.c
-@@ -437,6 +437,16 @@ int kvm_unpark_vcpu(KVMState *s, unsigned long vcpu_id)
-     return kvm_fd;
- }
- 
-+static void kvm_reset_parked_vcpus(void *param)
-+{
-+    KVMState *s = param;
-+    struct KVMParkedVcpu *cpu;
-+
-+    QLIST_FOREACH(cpu, &s->kvm_parked_vcpus, node) {
-+        kvm_arch_reset_parked_vcpu(cpu->vcpu_id, cpu->kvm_fd);
-+    }
-+}
-+
- int kvm_create_vcpu(CPUState *cpu)
- {
-     unsigned long vcpu_id = kvm_arch_vcpu_id(cpu);
-@@ -2728,6 +2738,7 @@ static int kvm_init(MachineState *ms)
-     }
- 
-     qemu_register_reset(kvm_unpoison_all, NULL);
-+    qemu_register_reset(kvm_reset_parked_vcpus, s);
- 
-     if (s->kernel_irqchip_allowed) {
-         kvm_irqchip_create(s);
-diff --git a/configs/targets/i386-softmmu.mak b/configs/targets/i386-softmmu.mak
-index 2ac69d5ba3..2eb0e86250 100644
--- a/configs/targets/i386-softmmu.mak
-+++ b/configs/targets/i386-softmmu.mak
-@@ -1,4 +1,5 @@
- TARGET_ARCH=i386
- TARGET_SUPPORTS_MTTCG=y
- TARGET_KVM_HAVE_GUEST_DEBUG=y
-+TARGET_KVM_HAVE_RESET_PARKED_VCPU=y
- TARGET_XML_FILES= gdb-xml/i386-32bit.xml
-diff --git a/configs/targets/x86_64-softmmu.mak b/configs/targets/x86_64-softmmu.mak
-index e12ac3dc59..920e9a4200 100644
--- a/configs/targets/x86_64-softmmu.mak
-+++ b/configs/targets/x86_64-softmmu.mak
-@@ -2,4 +2,5 @@ TARGET_ARCH=x86_64
- TARGET_BASE_ARCH=i386
- TARGET_SUPPORTS_MTTCG=y
- TARGET_KVM_HAVE_GUEST_DEBUG=y
-+TARGET_KVM_HAVE_RESET_PARKED_VCPU=y
- TARGET_XML_FILES= gdb-xml/i386-64bit.xml
-diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
-index c3a60b2890..ab17c09a55 100644
--- a/include/sysemu/kvm.h
-+++ b/include/sysemu/kvm.h
-@@ -377,6 +377,14 @@ int kvm_arch_init(MachineState *ms, KVMState *s);
- int kvm_arch_init_vcpu(CPUState *cpu);
- int kvm_arch_destroy_vcpu(CPUState *cpu);
- 
-+#ifdef TARGET_KVM_HAVE_RESET_PARKED_VCPU
-+void kvm_arch_reset_parked_vcpu(unsigned long vcpu_id, int kvm_fd);
-+#else
-+static inline void kvm_arch_reset_parked_vcpu(unsigned long vcpu_id, int kvm_fd)
-+{
-+}
-+#endif
-+
- bool kvm_vcpu_id_is_valid(int vcpu_id);
- 
- /* Returns VCPU ID to be used on KVM_CREATE_VCPU ioctl() */
-diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
-index 8e17942c3b..2ff618fbf1 100644
--- a/target/i386/kvm/kvm.c
-+++ b/target/i386/kvm/kvm.c
-@@ -2415,6 +2415,21 @@ void kvm_arch_after_reset_vcpu(X86CPU *cpu)
-     }
- }
- 
-+void kvm_arch_reset_parked_vcpu(unsigned long vcpu_id, int kvm_fd)
-+{
-+    g_autofree struct kvm_msrs *msrs = NULL;
-+
-+    msrs = g_malloc0(sizeof(*msrs) + sizeof(msrs->entries[0]));
-+    msrs->entries[0].index = MSR_IA32_TSC;
-+    msrs->entries[0].data = 1; /* match the value in x86_cpu_reset() */
-+    msrs->nmsrs++;
-+
-+    if (ioctl(kvm_fd, KVM_SET_MSRS, msrs) != 1) {
-+        warn_report("parked vCPU %lu TSC reset failed: %d",
-+                    vcpu_id, errno);
-+    }
-+}
-+
- void kvm_arch_do_init_vcpu(X86CPU *cpu)
- {
-     CPUX86State *env = &cpu->env;
--- a/debian/patches/extra/0005-block-copy-before-write-use-uint64_t-for-timeout-in-.patch
+++ b/debian/patches/extra/0005-block-copy-before-write-use-uint64_t-for-timeout-in-.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fiona Ebner <f.ebner@proxmox.com>
+Date: Mon, 29 Apr 2024 15:41:11 +0200
+Subject: [PATCH] block/copy-before-write: use uint64_t for timeout in
+ nanoseconds
+
+rather than the uint32_t for which the maximum is slightly more than 4
+seconds and larger values would overflow. The QAPI interface allows
+specifying the number of seconds, so only values 0 to 4 are safe right
+now, other values lead to a much lower timeout than a user expects.
+
+The block_copy() call where this is used already takes a uint64_t for
+the timeout, so no change required there.
+
+Fixes: 6db7fd1ca9 ("block/copy-before-write: implement cbw-timeout option")
+Reported-by: Friedrich Weber <f.weber@proxmox.com>
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+Tested-by: Friedrich Weber <f.weber@proxmox.com>
+---
+ block/copy-before-write.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/block/copy-before-write.c b/block/copy-before-write.c
+index 8aba27a71d..026fa9840f 100644
+--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
+@@ -43,7 +43,7 @@ typedef struct BDRVCopyBeforeWriteState {
+     BlockCopyState *bcs;
+     BdrvChild *target;
+     OnCbwError on_cbw_error;
+-    uint32_t cbw_timeout_ns;
+    uint64_t cbw_timeout_ns;
+ 
+     /*
+      * @lock: protects access to @access_bitmap, @done_bitmap and
--- a/debian/patches/extra/0005-i386-cpu-Mark-avx10_version-filtered-when-prefix-is-.patch
+++ b/debian/patches/extra/0005-i386-cpu-Mark-avx10_version-filtered-when-prefix-is-.patch
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zhao Liu <zhao1.liu@intel.com>
-Date: Wed, 6 Nov 2024 11:07:18 +0800
-Subject: [PATCH] i386/cpu: Mark avx10_version filtered when prefix is NULL
-
-In x86_cpu_filter_features(), if host doesn't support AVX10, the
-configured avx10_version should be marked as filtered regardless of
-whether prefix is NULL or not.
-
-Check prefix before warn_report() instead of checking for
-have_filtered_features.
-
-Cc: qemu-stable@nongnu.org
-Fixes: commit bccfb846fd52 ("target/i386: add AVX10 feature and AVX10 version property")
-Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
-Reviewed-by: Tao Su <tao1.su@linux.intel.com>
-Link: https://lore.kernel.org/r/20241106030728.553238-2-zhao1.liu@intel.com
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit cf4c263551886964c5d58bd7b675b13fd497b402)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- target/i386/cpu.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index 3725dbbc4b..1981aeaba5 100644
--- a/target/i386/cpu.c
-+++ b/target/i386/cpu.c
-@@ -7718,8 +7718,10 @@ static bool x86_cpu_filter_features(X86CPU *cpu, bool verbose)
-             env->avx10_version = version;
-             have_filtered_features = true;
-         }
-    } else if (env->avx10_version && prefix) {
-        warn_report("%s: avx10.%d.", prefix, env->avx10_version);
-+    } else if (env->avx10_version) {
-+        if (prefix) {
-+            warn_report("%s: avx10.%d.", prefix, env->avx10_version);
-+        }
-         have_filtered_features = true;
-     }
- 
--- a/debian/patches/extra/0006-Revert-virtio-pci-fix-use-of-a-released-vector.patch
+++ b/debian/patches/extra/0006-Revert-virtio-pci-fix-use-of-a-released-vector.patch
@@ -0,0 +1,87 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fiona Ebner <f.ebner@proxmox.com>
+Date: Thu, 16 May 2024 12:59:52 +0200
+Subject: [PATCH] Revert "virtio-pci: fix use of a released vector"
+
+This reverts commit 2ce6cff94df2650c460f809e5ad263f1d22507c0.
+
+The fix causes some issues:
+https://gitlab.com/qemu-project/qemu/-/issues/2321
+https://gitlab.com/qemu-project/qemu/-/issues/2334
+
+The CVE fixed by commit 2ce6cff94d ("virtio-pci: fix use of a released
+vector") is CVE-2024-4693 [0] and allows a malicious guest that
+controls the boot process in the guest to crash its QEMU process.
+
+The issues sound worse than the CVE, so revert until there is a proper
+fix.
+
+[0]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-4693
+
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ hw/virtio/virtio-pci.c | 37 ++-----------------------------------
+ 1 file changed, 2 insertions(+), 35 deletions(-)
+
+diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
+index e04218a9fb..fd66713848 100644
+--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
+@@ -1410,38 +1410,6 @@ static int virtio_pci_add_mem_cap(VirtIOPCIProxy *proxy,
+     return offset;
+ }
+ 
+-static void virtio_pci_set_vector(VirtIODevice *vdev,
+-                                  VirtIOPCIProxy *proxy,
+-                                  int queue_no, uint16_t old_vector,
+-                                  uint16_t new_vector)
+-{
+-    bool kvm_irqfd = (vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) &&
+-        msix_enabled(&proxy->pci_dev) && kvm_msi_via_irqfd_enabled();
+-
+-    if (new_vector == old_vector) {
+-        return;
+-    }
+-
+-    /*
+-     * If the device uses irqfd and the vector changes after DRIVER_OK is
+-     * set, we need to release the old vector and set up the new one.
+-     * Otherwise just need to set the new vector on the device.
+-     */
+-    if (kvm_irqfd && old_vector != VIRTIO_NO_VECTOR) {
+-        kvm_virtio_pci_vector_release_one(proxy, queue_no);
+-    }
+-    /* Set the new vector on the device. */
+-    if (queue_no == VIRTIO_CONFIG_IRQ_IDX) {
+-        vdev->config_vector = new_vector;
+-    } else {
+-        virtio_queue_set_vector(vdev, queue_no, new_vector);
+-    }
+-    /* If the new vector changed need to set it up. */
+-    if (kvm_irqfd && new_vector != VIRTIO_NO_VECTOR) {
+-        kvm_virtio_pci_vector_use_one(proxy, queue_no);
+-    }
+-}
+-
+ int virtio_pci_add_shm_cap(VirtIOPCIProxy *proxy,
+                            uint8_t bar, uint64_t offset, uint64_t length,
+                            uint8_t id)
+@@ -1588,8 +1556,7 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
+         } else {
+             val = VIRTIO_NO_VECTOR;
+         }
+-        virtio_pci_set_vector(vdev, proxy, VIRTIO_CONFIG_IRQ_IDX,
+-                              vdev->config_vector, val);
+        vdev->config_vector = val;
+         break;
+     case VIRTIO_PCI_COMMON_STATUS:
+         if (!(val & VIRTIO_CONFIG_S_DRIVER_OK)) {
+@@ -1629,7 +1596,7 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
+         } else {
+             val = VIRTIO_NO_VECTOR;
+         }
+-        virtio_pci_set_vector(vdev, proxy, vdev->queue_sel, vector, val);
+        virtio_queue_set_vector(vdev, vdev->queue_sel, val);
+         break;
+     case VIRTIO_PCI_COMMON_Q_ENABLE:
+         if (val == 1) {
--- a/debian/patches/extra/0006-net-Fix-announce_self.patch
+++ b/debian/patches/extra/0006-net-Fix-announce_self.patch
@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Laurent Vivier <lvivier@redhat.com>
-Date: Fri, 17 Jan 2025 12:17:08 +0100
-Subject: [PATCH] net: Fix announce_self
-
-b9ad513e1876 ("net: Remove receive_raw()") adds an iovec entry
-in qemu_deliver_packet_iov() to add the virtio-net header
-in the data when QEMU_NET_PACKET_FLAG_RAW is set but forgets
-to increase the number of iovec entries in the array, so
-receive_iov() will only send the first entry (the virtio-net
-entry, full of 0) and no data. The packet will be discarded.
-
-The only user of QEMU_NET_PACKET_FLAG_RAW is announce_self.
-
-We can see the problem with tcpdump:
-
- QEMU parameters:
-
-  .. -monitor stdio \
-     -netdev bridge,id=netdev0,br=virbr0 \
-     -device virtio-net,mac=9a:2b:2c:2d:2e:2f,netdev=netdev0 \
-
- HMP command:
-
-  (qemu) announce_self
-
- TCP dump:
-
-  $ sudo tcpdump -nxi virbr0
-
-  without the fix:
-
-    <nothing>
-
-  with the fix:
-
-   ARP, Reverse Request who-is 9a:2b:2c:2d:2e:2f tell 9a:2b:2c:2d:2e:2f, length 46
-        0x0000:  0001 0800 0604 0003 9a2b 2c2d 2e2f 0000
-        0x0010:  0000 9a2b 2c2d 2e2f 0000 0000 0000 0000
-        0x0020:  0000 0000 0000 0000 0000 0000 0000
-
-Reported-by: Xiaohui Li <xiaohli@redhat.com>
-Bug: https://issues.redhat.com/browse/RHEL-73891
-Fixes: b9ad513e1876 ("net: Remove receive_raw()")
-Cc: akihiko.odaki@daynix.com
-Signed-off-by: Laurent Vivier <lvivier@redhat.com>
-Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
-Acked-by: Jason Wang <jasowang@redhat.com>
-Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
-(picked from https://lore.kernel.org/qemu-devel/20250117111709.970789-2-lvivier@redhat.com/)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- net/net.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/net/net.c b/net/net.c
-index 7ef6885876..fefa701bb2 100644
--- a/net/net.c
-+++ b/net/net.c
-@@ -822,6 +822,7 @@ static ssize_t qemu_deliver_packet_iov(NetClientState *sender,
-         iov_copy[0].iov_len =  nc->vnet_hdr_len;
-         memcpy(&iov_copy[1], iov, iovcnt * sizeof(*iov));
-         iov = iov_copy;
-+        iovcnt++;
-     }
- 
-     if (nc->info->receive_iov) {
--- a/debian/patches/extra/0007-block-copy-before-write-fix-permission.patch
+++ b/debian/patches/extra/0007-block-copy-before-write-fix-permission.patch
@@ -0,0 +1,55 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
+Date: Thu, 11 Apr 2024 11:29:22 +0200
+Subject: [PATCH] block/copy-before-write: fix permission
+
+In case when source node does not have any parents, the condition still
+works as required: backup job do create the parent by
+
+  block_job_create -> block_job_add_bdrv -> bdrv_root_attach_child
+
+Still, in this case checking @perm variable doesn't work, as backup job
+creates the root blk with empty permissions (as it rely on CBW filter
+to require correct permissions and don't want to create extra
+conflicts).
+
+So, we should not check @perm.
+
+The hack may be dropped entirely when transactional insertion of
+filter (when we don't try to recalculate permissions in intermediate
+state, when filter does conflict with original parent of the source
+node) merged (old big series
+"[PATCH v5 00/45] Transactional block-graph modifying API"[1] and it's
+current in-flight part is "[PATCH v8 0/7] blockdev-replace"[2])
+
+[1] https://patchew.org/QEMU/20220330212902.590099-1-vsementsov@openvz.org/
+[2] https://patchew.org/QEMU/20231017184444.932733-1-vsementsov@yandex-team.ru/
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ block/copy-before-write.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/block/copy-before-write.c b/block/copy-before-write.c
+index 026fa9840f..5a9456d426 100644
+--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
+@@ -364,9 +364,13 @@ cbw_child_perm(BlockDriverState *bs, BdrvChild *c, BdrvChildRole role,
+                            perm, shared, nperm, nshared);
+ 
+         if (!QLIST_EMPTY(&bs->parents)) {
+-            if (perm & BLK_PERM_WRITE) {
+-                *nperm = *nperm | BLK_PERM_CONSISTENT_READ;
+-            }
+            /*
+             * Note, that source child may be shared with backup job. Backup job
+             * does create own blk parent on copy-before-write node, so this
+             * works even if source node does not have any parents before backup
+             * start
+             */
+            *nperm = *nperm | BLK_PERM_CONSISTENT_READ;
+             *nshared &= ~(BLK_PERM_WRITE | BLK_PERM_RESIZE);
+         }
+     }
--- a/debian/patches/extra/0007-net-dump-Correctly-compute-Ethernet-packet-offset.patch
+++ b/debian/patches/extra/0007-net-dump-Correctly-compute-Ethernet-packet-offset.patch
@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Laurent Vivier <lvivier@redhat.com>
-Date: Fri, 17 Jan 2025 12:17:09 +0100
-Subject: [PATCH] net/dump: Correctly compute Ethernet packet offset
-
-When a packet is sent with QEMU_NET_PACKET_FLAG_RAW by QEMU it
-never includes virtio-net header even if qemu_get_vnet_hdr_len()
-is not 0, and filter-dump is not managing this case.
-
-The only user of QEMU_NET_PACKET_FLAG_RAW is announce_self,
-we can show the problem using it and tcpddump:
-
- QEMU parameters:
-
-  .. -monitor stdio \
-     -netdev bridge,id=netdev0,br=virbr0 \
-     -device virtio-net,mac=9a:2b:2c:2d:2e:2f,netdev=netdev0 \
-     -object filter-dump,netdev=netdev0,file=log.pcap,id=pcap0
-
- HMP command:
-
-  (qemu) announce_self
-
- TCP dump:
-
-  $ tcpdump -nxr log.pcap
-
-  without the fix:
-
-    08:00:06:04:00:03 > 2e:2f:80:35:00:01, ethertype Unknown (0x9a2b), length 50:
-         0x0000:  2c2d 2e2f 0000 0000 9a2b 2c2d 2e2f 0000
-         0x0010:  0000 0000 0000 0000 0000 0000 0000 0000
-         0x0020:  0000 0000
-
-  with the fix:
-
-    ARP, Reverse Request who-is 9a:2b:2c:2d:2e:2f tell 9a:2b:2c:2d:2e:2f, length 46
-         0x0000:  0001 0800 0604 0003 9a2b 2c2d 2e2f 0000
-         0x0010:  0000 9a2b 2c2d 2e2f 0000 0000 0000 0000
-         0x0020:  0000 0000 0000 0000 0000 0000 0000
-
-Fixes: 481c52320a26 ("net: Strip virtio-net header when dumping")
-Cc: akihiko.odaki@daynix.com
-Signed-off-by: Laurent Vivier <lvivier@redhat.com>
-Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
-Acked-by: Jason Wang <jasowang@redhat.com>
-Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
-(picked from https://lore.kernel.org/qemu-devel/20250117111709.970789-3-lvivier@redhat.com/)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- net/dump.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/net/dump.c b/net/dump.c
-index 956e34a123..42ab8d7716 100644
--- a/net/dump.c
-+++ b/net/dump.c
-@@ -155,7 +155,8 @@ static ssize_t filter_dump_receive_iov(NetFilterState *nf, NetClientState *sndr,
- {
-     NetFilterDumpState *nfds = FILTER_DUMP(nf);
- 
-    dump_receive_iov(&nfds->ds, iov, iovcnt, qemu_get_vnet_hdr_len(nf->netdev));
-+    dump_receive_iov(&nfds->ds, iov, iovcnt, flags & QEMU_NET_PACKET_FLAG_RAW ?
-+                     0 : qemu_get_vnet_hdr_len(nf->netdev));
-     return 0;
- }
- 
--- a/debian/patches/extra/0008-block-copy-before-write-support-unligned-snapshot-di.patch
+++ b/debian/patches/extra/0008-block-copy-before-write-support-unligned-snapshot-di.patch
@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
+Date: Thu, 11 Apr 2024 11:29:23 +0200
+Subject: [PATCH] block/copy-before-write: support unligned snapshot-discard
+
+First thing that crashes on unligned access here is
+bdrv_reset_dirty_bitmap(). Correct way is to align-down the
+snapshot-discard request.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ block/copy-before-write.c | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/block/copy-before-write.c b/block/copy-before-write.c
+index 5a9456d426..c0e70669a2 100644
+--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
+@@ -325,14 +325,24 @@ static int coroutine_fn GRAPH_RDLOCK
+ cbw_co_pdiscard_snapshot(BlockDriverState *bs, int64_t offset, int64_t bytes)
+ {
+     BDRVCopyBeforeWriteState *s = bs->opaque;
+    uint32_t cluster_size = block_copy_cluster_size(s->bcs);
+    int64_t aligned_offset = QEMU_ALIGN_UP(offset, cluster_size);
+    int64_t aligned_end = QEMU_ALIGN_DOWN(offset + bytes, cluster_size);
+    int64_t aligned_bytes;
+
+    if (aligned_end <= aligned_offset) {
+        return 0;
+    }
+    aligned_bytes = aligned_end - aligned_offset;
+ 
+     WITH_QEMU_LOCK_GUARD(&s->lock) {
+-        bdrv_reset_dirty_bitmap(s->access_bitmap, offset, bytes);
+        bdrv_reset_dirty_bitmap(s->access_bitmap, aligned_offset,
+                                aligned_bytes);
+     }
+ 
+-    block_copy_reset(s->bcs, offset, bytes);
+    block_copy_reset(s->bcs, aligned_offset, aligned_bytes);
+ 
+-    return bdrv_co_pdiscard(s->target, offset, bytes);
+    return bdrv_co_pdiscard(s->target, aligned_offset, aligned_bytes);
+ }
+ 
+ static void GRAPH_RDLOCK cbw_refresh_filename(BlockDriverState *bs)
--- a/debian/patches/extra/0008-pci-acpi-Windows-PCI-Label-Id-bug-workaround.patch
+++ b/debian/patches/extra/0008-pci-acpi-Windows-PCI-Label-Id-bug-workaround.patch
@@ -1,96 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Igor Mammedov <imammedo@redhat.com>
-Date: Wed, 15 Jan 2025 13:53:41 +0100
-Subject: [PATCH] pci: acpi: Windows 'PCI Label Id' bug workaround
-
-Current versions of Windows call _DSM(func=7) regardless
-of whether it is supported or not. It leads to NICs having bogus
-'PCI Label Id = 0', where none should be set at all.
-
-Also presence of 'PCI Label Id' triggers another Windows bug
-on localized versions that leads to hangs. The later bug is fixed
-in latest updates for 'Windows Server' but not in consumer
-versions of Windows (and there is no plans to fix it
-as far as I'm aware).
-
-Given it's easy, implement Microsoft suggested workaround
-(return invalid Package) so that affected Windows versions
-could boot on QEMU.
-This would effectvely remove bogus 'PCI Label Id's on NICs,
-but MS teem confirmed that flipping 'PCI Label Id' should not
-change 'Network Connection' ennumeration, so it should be safe
-for QEMU to change _DSM without any compat code.
-
-Smoke tested with WinXP and WS2022
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/774
-Signed-off-by: Igor Mammedov <imammedo@redhat.com>
-Message-Id: <20250115125342.3883374-3-imammedo@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-(cherry picked from commit 0b053391985abcc40b16ac8fc4a7f6588d1d95c1)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/i386/acpi-build.c | 33 +++++++++++++++++++++++----------
- 1 file changed, 23 insertions(+), 10 deletions(-)
-
-diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
-index 9fcc2897b8..f7b961e04c 100644
--- a/hw/i386/acpi-build.c
-+++ b/hw/i386/acpi-build.c
-@@ -654,6 +654,7 @@ static Aml *aml_pci_pdsm(void)
-     Aml *acpi_index = aml_local(2);
-     Aml *zero = aml_int(0);
-     Aml *one = aml_int(1);
-+    Aml *not_supp = aml_int(0xFFFFFFFF);
-     Aml *func = aml_arg(2);
-     Aml *params = aml_arg(4);
-     Aml *bnum = aml_derefof(aml_index(params, aml_int(0)));
-@@ -678,7 +679,7 @@ static Aml *aml_pci_pdsm(void)
-          */
-         ifctx1 = aml_if(aml_lnot(
-                      aml_or(aml_equal(acpi_index, zero),
-                            aml_equal(acpi_index, aml_int(0xFFFFFFFF)), NULL)
-+                            aml_equal(acpi_index, not_supp), NULL)
-                  ));
-         {
-             /* have supported functions */
-@@ -704,18 +705,30 @@ static Aml *aml_pci_pdsm(void)
-     {
-        Aml *pkg = aml_package(2);
- 
-       aml_append(pkg, zero);
-       /*
-        * optional, if not impl. should return null string
-        */
-       aml_append(pkg, aml_string("%s", ""));
-       aml_append(ifctx, aml_store(pkg, ret));
-
-        aml_append(ifctx, aml_store(aml_call2("AIDX", bnum, sunum), acpi_index));
-+       aml_append(ifctx, aml_store(pkg, ret));
-        /*
-        * update acpi-index to actual value
-+        * Windows calls func=7 without checking if it's available,
-+        * as workaround Microsoft has suggested to return invalid for func7
-+        * Package, so return 2 elements package but only initialize elements
-+        * when acpi_index is supported and leave them uninitialized, which
-+        * leads elements to being Uninitialized ObjectType and should trip
-+        * Windows into discarding result as an unexpected and prevent setting
-+        * bogus 'PCI Label' on the device.
-         */
-       aml_append(ifctx, aml_store(acpi_index, aml_index(ret, zero)));
-+       ifctx1 = aml_if(aml_lnot(aml_lor(
-+                    aml_equal(acpi_index, zero), aml_equal(acpi_index, not_supp)
-+                )));
-+       {
-+           aml_append(ifctx1, aml_store(acpi_index, aml_index(ret, zero)));
-+           /*
-+            * optional, if not impl. should return null string
-+            */
-+           aml_append(ifctx1, aml_store(aml_string("%s", ""),
-+                                        aml_index(ret, one)));
-+       }
-+       aml_append(ifctx, ifctx1);
-+
-        aml_append(ifctx, aml_return(ret));
-     }
- 
--- a/debian/patches/extra/0009-block-copy-before-write-create-block_copy-bitmap-in-.patch
+++ b/debian/patches/extra/0009-block-copy-before-write-create-block_copy-bitmap-in-.patch
@@ -0,0 +1,373 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
+Date: Thu, 11 Apr 2024 11:29:24 +0200
+Subject: [PATCH] block/copy-before-write: create block_copy bitmap in filter
+ node
+
+Currently block_copy creates copy_bitmap in source node. But that is in
+bad relation with .independent_close=true of copy-before-write filter:
+source node may be detached and removed before .bdrv_close() handler
+called, which should call block_copy_state_free(), which in turn should
+remove copy_bitmap.
+
+That's all not ideal: it would be better if internal bitmap of
+block-copy object is not attached to any node. But that is not possible
+now.
+
+The simplest solution is just create copy_bitmap in filter node, where
+anyway two other bitmaps are created.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ block/block-copy.c         |   3 +-
+ block/copy-before-write.c  |   2 +-
+ include/block/block-copy.h |   1 +
+ tests/qemu-iotests/257.out | 112 ++++++++++++++++++-------------------
+ 4 files changed, 60 insertions(+), 58 deletions(-)
+
+diff --git a/block/block-copy.c b/block/block-copy.c
+index 9ee3dd7ef5..8fca2c3698 100644
+--- a/block/block-copy.c
+++ b/block/block-copy.c
+@@ -351,6 +351,7 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target,
+ }
+ 
+ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
+                                     BlockDriverState *copy_bitmap_bs,
+                                      const BdrvDirtyBitmap *bitmap,
+                                      Error **errp)
+ {
+@@ -367,7 +368,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
+         return NULL;
+     }
+ 
+-    copy_bitmap = bdrv_create_dirty_bitmap(source->bs, cluster_size, NULL,
+    copy_bitmap = bdrv_create_dirty_bitmap(copy_bitmap_bs, cluster_size, NULL,
+                                            errp);
+     if (!copy_bitmap) {
+         return NULL;
+diff --git a/block/copy-before-write.c b/block/copy-before-write.c
+index c0e70669a2..94db31512d 100644
+--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
+@@ -468,7 +468,7 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,
+             ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
+              bs->file->bs->supported_zero_flags);
+ 
+-    s->bcs = block_copy_state_new(bs->file, s->target, bitmap, errp);
+    s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap, errp);
+     if (!s->bcs) {
+         error_prepend(errp, "Cannot create block-copy-state: ");
+         return -EINVAL;
+diff --git a/include/block/block-copy.h b/include/block/block-copy.h
+index 0700953ab8..8b41643bfa 100644
+--- a/include/block/block-copy.h
+++ b/include/block/block-copy.h
+@@ -25,6 +25,7 @@ typedef struct BlockCopyState BlockCopyState;
+ typedef struct BlockCopyCallState BlockCopyCallState;
+ 
+ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
+                                     BlockDriverState *copy_bitmap_bs,
+                                      const BdrvDirtyBitmap *bitmap,
+                                      Error **errp);
+ 
+diff --git a/tests/qemu-iotests/257.out b/tests/qemu-iotests/257.out
+index aa76131ca9..c33dd7f3a9 100644
+--- a/tests/qemu-iotests/257.out
+++ b/tests/qemu-iotests/257.out
+@@ -120,16 +120,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
+@@ -596,16 +596,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
+@@ -865,16 +865,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
+@@ -1341,16 +1341,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
+@@ -1610,16 +1610,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
+@@ -2086,16 +2086,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
+@@ -2355,16 +2355,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
+@@ -2831,16 +2831,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
+@@ -3100,16 +3100,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
+@@ -3576,16 +3576,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
+@@ -3845,16 +3845,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
+@@ -4321,16 +4321,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
+@@ -4590,16 +4590,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
+@@ -5066,16 +5066,16 @@ write -P0x67 0x3fe0000 0x20000
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      }
+-    ],
+-    "drive0": [
+      },
+       {
+         "busy": false,
+         "count": 0,
+         "granularity": 65536,
+         "persistent": false,
+         "recording": false
+-      },
+      }
+    ],
+    "drive0": [
+       {
+         "busy": false,
+         "count": 458752,
--- a/debian/patches/extra/0009-hw-usb-hcd-xhci-pci-Use-modulo-to-select-MSI-vector-.patch
+++ b/debian/patches/extra/0009-hw-usb-hcd-xhci-pci-Use-modulo-to-select-MSI-vector-.patch
@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Phil Dennis-Jordan <phil@philjordan.eu>
-Date: Fri, 13 Dec 2024 17:06:14 +0100
-Subject: [PATCH] hw/usb/hcd-xhci-pci: Use modulo to select MSI vector as per
- spec
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-QEMU would crash with a failed assertion if the XHCI controller
-attempted to raise the interrupt on an interrupter corresponding
-to a MSI vector with a higher index than the highest configured
-for the device by the guest driver.
-
-This behaviour is correct on the MSI/PCI side: per PCI 3.0 spec,
-devices must ensure they do not send MSI notifications for
-vectors beyond the range of those allocated by the system/driver
-software. Unlike MSI-X, there is no generic way for handling
-aliasing in the case of fewer allocated vectors than requested,
-so the specifics are up to device implementors. (Section
-6.8.3.4. "Sending Messages")
-
-It turns out the XHCI spec (Implementation Note in section 4.17,
-"Interrupters") requires that the host controller signal the MSI
-vector with the number computed by taking the interrupter number
-modulo the number of enabled MSI vectors.
-
-This change introduces that modulo calculation, fixing the
-failed assertion. This makes the device work correctly in MSI mode
-with macOS's XHCI driver, which only allocates a single vector.
-
-Signed-off-by: Phil Dennis-Jordan <phil@philjordan.eu>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-Message-ID: <20250112210056.16658-2-phil@philjordan.eu>
-Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-(cherry picked from commit bb5b7fced6b5d3334ab20702fc846e47bb1fb731)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/usb/hcd-xhci-pci.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c
-index a039f5778a..516e6909d2 100644
--- a/hw/usb/hcd-xhci-pci.c
-+++ b/hw/usb/hcd-xhci-pci.c
-@@ -74,6 +74,7 @@ static bool xhci_pci_intr_raise(XHCIState *xhci, int n, bool level)
-     }
- 
-     if (msi_enabled(pci_dev) && level) {
-+        n %= msi_nr_vectors_allocated(pci_dev);
-         msi_notify(pci_dev, n);
-         return true;
-     }
--- a/debian/patches/extra/0010-pci-ensure-valid-link-status-bits-for-downstream-por.patch
+++ b/debian/patches/extra/0010-pci-ensure-valid-link-status-bits-for-downstream-por.patch
@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sebastian Ott <sebott@redhat.com>
-Date: Tue, 3 Dec 2024 13:19:28 +0100
-Subject: [PATCH] pci: ensure valid link status bits for downstream ports
-
-PCI hotplug for downstream endpoints on arm fails because Linux'
-PCIe hotplug driver doesn't like the QEMU provided LNKSTA:
-
-  pcieport 0000:08:01.0: pciehp: Slot(2): Card present
-  pcieport 0000:08:01.0: pciehp: Slot(2): Link Up
-  pcieport 0000:08:01.0: pciehp: Slot(2): Cannot train link: status 0x2000
-
-There's 2 cases where LNKSTA isn't setup properly:
-* the downstream device has no express capability
-* max link width of the bridge is 0
-
-Move the sanity checks added via 88c869198aa63
-("pci: Sanity test minimum downstream LNKSTA") outside of the
-branch to make sure downstream ports always have a valid LNKSTA.
-
-Signed-off-by: Sebastian Ott <sebott@redhat.com>
-Tested-by: Zhenyu Zhang <zhenyzha@redhat.com>
-Message-Id: <20241203121928.14861-1-sebott@redhat.com>
-Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-(cherry picked from commit 694632fd44987cc4618612a38ad151047524a590)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/pci/pcie.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
-index 0b455c8654..1b12db6fa2 100644
--- a/hw/pci/pcie.c
-+++ b/hw/pci/pcie.c
-@@ -1113,18 +1113,22 @@ void pcie_sync_bridge_lnk(PCIDevice *bridge_dev)
-         if ((lnksta & PCI_EXP_LNKSTA_NLW) > (lnkcap & PCI_EXP_LNKCAP_MLW)) {
-             lnksta &= ~PCI_EXP_LNKSTA_NLW;
-             lnksta |= lnkcap & PCI_EXP_LNKCAP_MLW;
-        } else if (!(lnksta & PCI_EXP_LNKSTA_NLW)) {
-            lnksta |= QEMU_PCI_EXP_LNKSTA_NLW(QEMU_PCI_EXP_LNK_X1);
-         }
- 
-         if ((lnksta & PCI_EXP_LNKSTA_CLS) > (lnkcap & PCI_EXP_LNKCAP_SLS)) {
-             lnksta &= ~PCI_EXP_LNKSTA_CLS;
-             lnksta |= lnkcap & PCI_EXP_LNKCAP_SLS;
-        } else if (!(lnksta & PCI_EXP_LNKSTA_CLS)) {
-            lnksta |= QEMU_PCI_EXP_LNKSTA_CLS(QEMU_PCI_EXP_LNK_2_5GT);
-         }
-     }
- 
-+    if (!(lnksta & PCI_EXP_LNKSTA_NLW)) {
-+        lnksta |= QEMU_PCI_EXP_LNKSTA_NLW(QEMU_PCI_EXP_LNK_X1);
-+    }
-+
-+    if (!(lnksta & PCI_EXP_LNKSTA_CLS)) {
-+        lnksta |= QEMU_PCI_EXP_LNKSTA_CLS(QEMU_PCI_EXP_LNK_2_5GT);
-+    }
-+
-     pci_word_test_and_clear_mask(exp_cap + PCI_EXP_LNKSTA,
-                                  PCI_EXP_LNKSTA_CLS | PCI_EXP_LNKSTA_NLW);
-     pci_word_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA, lnksta &
--- a/debian/patches/extra/0010-qapi-blockdev-backup-add-discard-source-parameter.patch
+++ b/debian/patches/extra/0010-qapi-blockdev-backup-add-discard-source-parameter.patch
@@ -0,0 +1,277 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
+Date: Thu, 11 Apr 2024 11:29:25 +0200
+Subject: [PATCH] qapi: blockdev-backup: add discard-source parameter
+
+Add a parameter that enables discard-after-copy. That is mostly useful
+in "push backup with fleecing" scheme, when source is snapshot-access
+format driver node, based on copy-before-write filter snapshot-access
+API:
+
+[guest]      [snapshot-access] ~~ blockdev-backup ~~> [backup target]
+   |            |
+   | root       | file
+   v            v
+[copy-before-write]
+   |             |
+   | file        | target
+   v             v
+[active disk]   [temp.img]
+
+In this case discard-after-copy does two things:
+
+ - discard data in temp.img to save disk space
+ - avoid further copy-before-write operation in discarded area
+
+Note that we have to declare WRITE permission on source in
+copy-before-write filter, for discard to work. Still we can't take it
+unconditionally, as it will break normal backup from RO source. So, we
+have to add a parameter and pass it thorough bdrv_open flags.
+
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ block/backup.c                         |  5 +++--
+ block/block-copy.c                     |  9 +++++++++
+ block/copy-before-write.c              | 15 +++++++++++++--
+ block/copy-before-write.h              |  1 +
+ block/replication.c                    |  4 ++--
+ blockdev.c                             |  2 +-
+ include/block/block-common.h           |  2 ++
+ include/block/block-copy.h             |  1 +
+ include/block/block_int-global-state.h |  2 +-
+ qapi/block-core.json                   |  4 ++++
+ 10 files changed, 37 insertions(+), 8 deletions(-)
+
+diff --git a/block/backup.c b/block/backup.c
+index ec29d6b810..3dd2e229d2 100644
+--- a/block/backup.c
+++ b/block/backup.c
+@@ -356,7 +356,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
+                   BlockDriverState *target, int64_t speed,
+                   MirrorSyncMode sync_mode, BdrvDirtyBitmap *sync_bitmap,
+                   BitmapSyncMode bitmap_mode,
+-                  bool compress,
+                  bool compress, bool discard_source,
+                   const char *filter_node_name,
+                   BackupPerf *perf,
+                   BlockdevOnError on_source_error,
+@@ -457,7 +457,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
+         goto error;
+     }
+ 
+-    cbw = bdrv_cbw_append(bs, target, filter_node_name, &bcs, errp);
+    cbw = bdrv_cbw_append(bs, target, filter_node_name, discard_source,
+                          &bcs, errp);
+     if (!cbw) {
+         goto error;
+     }
+diff --git a/block/block-copy.c b/block/block-copy.c
+index 8fca2c3698..7e3b378528 100644
+--- a/block/block-copy.c
+++ b/block/block-copy.c
+@@ -137,6 +137,7 @@ typedef struct BlockCopyState {
+     CoMutex lock;
+     int64_t in_flight_bytes;
+     BlockCopyMethod method;
+    bool discard_source;
+     BlockReqList reqs;
+     QLIST_HEAD(, BlockCopyCallState) calls;
+     /*
+@@ -353,6 +354,7 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target,
+ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
+                                      BlockDriverState *copy_bitmap_bs,
+                                      const BdrvDirtyBitmap *bitmap,
+                                     bool discard_source,
+                                      Error **errp)
+ {
+     ERRP_GUARD();
+@@ -418,6 +420,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
+                                     cluster_size),
+     };
+ 
+    s->discard_source = discard_source;
+     block_copy_set_copy_opts(s, false, false);
+ 
+     ratelimit_init(&s->rate_limit);
+@@ -589,6 +592,12 @@ static coroutine_fn int block_copy_task_entry(AioTask *task)
+     co_put_to_shres(s->mem, t->req.bytes);
+     block_copy_task_end(t, ret);
+ 
+    if (s->discard_source && ret == 0) {
+        int64_t nbytes =
+            MIN(t->req.offset + t->req.bytes, s->len) - t->req.offset;
+        bdrv_co_pdiscard(s->source, t->req.offset, nbytes);
+    }
+
+     return ret;
+ }
+ 
+diff --git a/block/copy-before-write.c b/block/copy-before-write.c
+index 94db31512d..853e01a1eb 100644
+--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
+@@ -44,6 +44,7 @@ typedef struct BDRVCopyBeforeWriteState {
+     BdrvChild *target;
+     OnCbwError on_cbw_error;
+     uint64_t cbw_timeout_ns;
+    bool discard_source;
+ 
+     /*
+      * @lock: protects access to @access_bitmap, @done_bitmap and
+@@ -357,6 +358,8 @@ cbw_child_perm(BlockDriverState *bs, BdrvChild *c, BdrvChildRole role,
+                uint64_t perm, uint64_t shared,
+                uint64_t *nperm, uint64_t *nshared)
+ {
+    BDRVCopyBeforeWriteState *s = bs->opaque;
+
+     if (!(role & BDRV_CHILD_FILTERED)) {
+         /*
+          * Target child
+@@ -381,6 +384,10 @@ cbw_child_perm(BlockDriverState *bs, BdrvChild *c, BdrvChildRole role,
+              * start
+              */
+             *nperm = *nperm | BLK_PERM_CONSISTENT_READ;
+            if (s->discard_source) {
+                *nperm = *nperm | BLK_PERM_WRITE;
+            }
+
+             *nshared &= ~(BLK_PERM_WRITE | BLK_PERM_RESIZE);
+         }
+     }
+@@ -468,7 +475,9 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,
+             ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
+              bs->file->bs->supported_zero_flags);
+ 
+-    s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap, errp);
+    s->discard_source = flags & BDRV_O_CBW_DISCARD_SOURCE;
+    s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap,
+                                  flags & BDRV_O_CBW_DISCARD_SOURCE, errp);
+     if (!s->bcs) {
+         error_prepend(errp, "Cannot create block-copy-state: ");
+         return -EINVAL;
+@@ -535,12 +544,14 @@ static BlockDriver bdrv_cbw_filter = {
+ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
+                                   BlockDriverState *target,
+                                   const char *filter_node_name,
+                                  bool discard_source,
+                                   BlockCopyState **bcs,
+                                   Error **errp)
+ {
+     BDRVCopyBeforeWriteState *state;
+     BlockDriverState *top;
+     QDict *opts;
+    int flags = BDRV_O_RDWR | (discard_source ? BDRV_O_CBW_DISCARD_SOURCE : 0);
+ 
+     assert(source->total_sectors == target->total_sectors);
+     GLOBAL_STATE_CODE();
+@@ -553,7 +564,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
+     qdict_put_str(opts, "file", bdrv_get_node_name(source));
+     qdict_put_str(opts, "target", bdrv_get_node_name(target));
+ 
+-    top = bdrv_insert_node(source, opts, BDRV_O_RDWR, errp);
+    top = bdrv_insert_node(source, opts, flags, errp);
+     if (!top) {
+         return NULL;
+     }
+diff --git a/block/copy-before-write.h b/block/copy-before-write.h
+index 6e72bb25e9..01af0cd3c4 100644
+--- a/block/copy-before-write.h
+++ b/block/copy-before-write.h
+@@ -39,6 +39,7 @@
+ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
+                                   BlockDriverState *target,
+                                   const char *filter_node_name,
+                                  bool discard_source,
+                                   BlockCopyState **bcs,
+                                   Error **errp);
+ void bdrv_cbw_drop(BlockDriverState *bs);
+diff --git a/block/replication.c b/block/replication.c
+index ca6bd0a720..0415a5e8b7 100644
+--- a/block/replication.c
+++ b/block/replication.c
+@@ -582,8 +582,8 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
+ 
+         s->backup_job = backup_job_create(
+                                 NULL, s->secondary_disk->bs, s->hidden_disk->bs,
+-                                0, MIRROR_SYNC_MODE_NONE, NULL, 0, false, NULL,
+-                                &perf,
+                                0, MIRROR_SYNC_MODE_NONE, NULL, 0, false, false,
+                                NULL, &perf,
+                                 BLOCKDEV_ON_ERROR_REPORT,
+                                 BLOCKDEV_ON_ERROR_REPORT, JOB_INTERNAL,
+                                 backup_job_completed, bs, NULL, &local_err);
+diff --git a/blockdev.c b/blockdev.c
+index 057601dcf0..4c33c3f5f0 100644
+--- a/blockdev.c
+++ b/blockdev.c
+@@ -2726,7 +2726,7 @@ static BlockJob *do_backup_common(BackupCommon *backup,
+ 
+     job = backup_job_create(backup->job_id, bs, target_bs, backup->speed,
+                             backup->sync, bmap, backup->bitmap_mode,
+-                            backup->compress,
+                            backup->compress, backup->discard_source,
+                             backup->filter_node_name,
+                             &perf,
+                             backup->on_source_error,
+diff --git a/include/block/block-common.h b/include/block/block-common.h
+index a846023a09..338fe5ff7a 100644
+--- a/include/block/block-common.h
+++ b/include/block/block-common.h
+@@ -243,6 +243,8 @@ typedef enum {
+                                       read-write fails */
+ #define BDRV_O_IO_URING    0x40000 /* use io_uring instead of the thread pool */
+ 
+#define BDRV_O_CBW_DISCARD_SOURCE 0x80000 /* for copy-before-write filter */
+
+ #define BDRV_O_CACHE_MASK  (BDRV_O_NOCACHE | BDRV_O_NO_FLUSH)
+ 
+ 
+diff --git a/include/block/block-copy.h b/include/block/block-copy.h
+index 8b41643bfa..bdc703bacd 100644
+--- a/include/block/block-copy.h
+++ b/include/block/block-copy.h
+@@ -27,6 +27,7 @@ typedef struct BlockCopyCallState BlockCopyCallState;
+ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
+                                      BlockDriverState *copy_bitmap_bs,
+                                      const BdrvDirtyBitmap *bitmap,
+                                     bool discard_source,
+                                      Error **errp);
+ 
+ /* Function should be called prior any actual copy request */
+diff --git a/include/block/block_int-global-state.h b/include/block/block_int-global-state.h
+index d2201e27f4..eb2d92a226 100644
+--- a/include/block/block_int-global-state.h
+++ b/include/block/block_int-global-state.h
+@@ -193,7 +193,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
+                             MirrorSyncMode sync_mode,
+                             BdrvDirtyBitmap *sync_bitmap,
+                             BitmapSyncMode bitmap_mode,
+-                            bool compress,
+                            bool compress, bool discard_source,
+                             const char *filter_node_name,
+                             BackupPerf *perf,
+                             BlockdevOnError on_source_error,
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index 4b18e01b85..b179d65520 100644
+--- a/qapi/block-core.json
+++ b/qapi/block-core.json
+@@ -1610,6 +1610,9 @@
+ #     node specified by @drive.  If this option is not given, a node
+ #     name is autogenerated.  (Since: 4.2)
+ #
+# @discard-source: Discard blocks on source which are already copied
+#     to the target.  (Since 9.0)
+#
+ # @x-perf: Performance options.  (Since 6.0)
+ #
+ # Features:
+@@ -1631,6 +1634,7 @@
+             '*on-target-error': 'BlockdevOnError',
+             '*auto-finalize': 'bool', '*auto-dismiss': 'bool',
+             '*filter-node-name': 'str',
+            '*discard-source': 'bool',
+             '*x-perf': { 'type': 'BackupPerf',
+                          'features': [ 'unstable' ] } } }
+ 
--- a/debian/patches/extra/0011-hw-virtio-Fix-the-de-initialization-of-vhost-user-de.patch
+++ b/debian/patches/extra/0011-hw-virtio-Fix-the-de-initialization-of-vhost-user-de.patch
@@ -0,0 +1,92 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Huth <thuth@redhat.com>
+Date: Tue, 18 Jun 2024 14:19:58 +0200
+Subject: [PATCH] hw/virtio: Fix the de-initialization of vhost-user devices
+
+The unrealize functions of the various vhost-user devices are
+calling the corresponding vhost_*_set_status() functions with a
+status of 0 to shut down the device correctly.
+
+Now these vhost_*_set_status() functions all follow this scheme:
+
+    bool should_start = virtio_device_should_start(vdev, status);
+
+    if (vhost_dev_is_started(&vvc->vhost_dev) == should_start) {
+        return;
+    }
+
+    if (should_start) {
+        /* ... do the initialization stuff ... */
+    } else {
+        /* ... do the cleanup stuff ... */
+    }
+
+The problem here is virtio_device_should_start(vdev, 0) currently
+always returns "true" since it internally only looks at vdev->started
+instead of looking at the "status" parameter. Thus once the device
+got started once, virtio_device_should_start() always returns true
+and thus the vhost_*_set_status() functions return early, without
+ever doing any clean-up when being called with status == 0. This
+causes e.g. problems when trying to hot-plug and hot-unplug a vhost
+user devices multiple times since the de-initialization step is
+completely skipped during the unplug operation.
+
+This bug has been introduced in commit 9f6bcfd99f ("hw/virtio: move
+vm_running check to virtio_device_started") which replaced
+
+ should_start = status & VIRTIO_CONFIG_S_DRIVER_OK;
+
+with
+
+ should_start = virtio_device_started(vdev, status);
+
+which later got replaced by virtio_device_should_start(). This blocked
+the possibility to set should_start to false in case the status flag
+VIRTIO_CONFIG_S_DRIVER_OK was not set.
+
+Fix it by adjusting the virtio_device_should_start() function to
+only consider the status flag instead of vdev->started. Since this
+function is only used in the various vhost_*_set_status() functions
+for exactly the same purpose, it should be fine to fix it in this
+central place there without any risk to change the behavior of other
+code.
+
+Fixes: 9f6bcfd99f ("hw/virtio: move vm_running check to virtio_device_started")
+Buglink: https://issues.redhat.com/browse/RHEL-40708
+Signed-off-by: Thomas Huth <thuth@redhat.com>
+Message-Id: <20240618121958.88673-1-thuth@redhat.com>
+Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
+Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+(cherry picked from commit d72479b11797c28893e1e3fc565497a9cae5ca16)
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ include/hw/virtio/virtio.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
+index 7d5ffdc145..2eafad17b8 100644
+--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
+@@ -470,9 +470,9 @@ static inline bool virtio_device_started(VirtIODevice *vdev, uint8_t status)
+  * @vdev - the VirtIO device
+  * @status - the devices status bits
+  *
+- * This is similar to virtio_device_started() but also encapsulates a
+- * check on the VM status which would prevent a device starting
+- * anyway.
+ * This is similar to virtio_device_started() but ignores vdev->started
+ * and also encapsulates a check on the VM status which would prevent a
+ * device from starting anyway.
+  */
+ static inline bool virtio_device_should_start(VirtIODevice *vdev, uint8_t status)
+ {
+@@ -480,7 +480,7 @@ static inline bool virtio_device_should_start(VirtIODevice *vdev, uint8_t status
+         return false;
+     }
+ 
+-    return virtio_device_started(vdev, status);
+    return status & VIRTIO_CONFIG_S_DRIVER_OK;
+ }
+ 
+ static inline void virtio_set_started(VirtIODevice *vdev, bool started)
--- a/debian/patches/extra/0011-pci-msix-Fix-msix-pba-read-vector-poll-end-calculati.patch
+++ b/debian/patches/extra/0011-pci-msix-Fix-msix-pba-read-vector-poll-end-calculati.patch
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nicholas Piggin <npiggin@gmail.com>
-Date: Thu, 12 Dec 2024 22:04:02 +1000
-Subject: [PATCH] pci/msix: Fix msix pba read vector poll end calculation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The end vector calculation has a bug that results in polling fewer
-than required vectors when reading at a non-zero offset in PBA memory.
-
-Fixes: bbef882cc193 ("msi: add API to get notified about pending bit poll")
-Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
-Message-Id: <20241212120402.1475053-1-npiggin@gmail.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-(cherry picked from commit 42e2a7a0ab23784e44fcb18369e06067abc89305)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/pci/msix.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/pci/msix.c b/hw/pci/msix.c
-index 487e49834e..cc6e79ec67 100644
--- a/hw/pci/msix.c
-+++ b/hw/pci/msix.c
-@@ -250,7 +250,7 @@ static uint64_t msix_pba_mmio_read(void *opaque, hwaddr addr,
-     PCIDevice *dev = opaque;
-     if (dev->msix_vector_poll_notifier) {
-         unsigned vector_start = addr * 8;
-        unsigned vector_end = MIN(addr + size * 8, dev->msix_entries_nr);
-+        unsigned vector_end = MIN((addr + size) * 8, dev->msix_entries_nr);
-         dev->msix_vector_poll_notifier(dev, vector_start, vector_end);
-     }
- 
--- a/debian/patches/extra/0012-target-arm-Use-float_status-copy-in-sme_fmopa_s.patch
+++ b/debian/patches/extra/0012-target-arm-Use-float_status-copy-in-sme_fmopa_s.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Daniyal Khan <danikhan632@gmail.com>
+Date: Wed, 17 Jul 2024 16:01:47 +1000
+Subject: [PATCH] target/arm: Use float_status copy in sme_fmopa_s
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We made a copy above because the fp exception flags
+are not propagated back to the FPST register, but
+then failed to use the copy.
+
+Cc: qemu-stable@nongnu.org
+Fixes: 558e956c719 ("target/arm: Implement FMOPA, FMOPS (non-widening)")
+Signed-off-by: Daniyal Khan <danikhan632@gmail.com>
+Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Message-id: 20240717060149.204788-2-richard.henderson@linaro.org
+[rth: Split from a larger patch]
+Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+(cherry picked from commit 31d93fedf41c24b0badb38cd9317590d1ef74e37)
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ target/arm/tcg/sme_helper.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/target/arm/tcg/sme_helper.c b/target/arm/tcg/sme_helper.c
+index e2e0575039..5a6dd76489 100644
+--- a/target/arm/tcg/sme_helper.c
+++ b/target/arm/tcg/sme_helper.c
+@@ -916,7 +916,7 @@ void HELPER(sme_fmopa_s)(void *vza, void *vzn, void *vzm, void *vpn,
+                         if (pb & 1) {
+                             uint32_t *a = vza_row + H1_4(col);
+                             uint32_t *m = vzm + H1_4(col);
+-                            *a = float32_muladd(n, *m, *a, 0, vst);
+                            *a = float32_muladd(n, *m, *a, 0, &fpst);
+                         }
+                         col += 4;
+                         pb >>= 4;
--- a/debian/patches/extra/0013-target-arm-Use-FPST_F16-for-SME-FMOPA-widening.patch
+++ b/debian/patches/extra/0013-target-arm-Use-FPST_F16-for-SME-FMOPA-widening.patch
@@ -0,0 +1,62 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Richard Henderson <richard.henderson@linaro.org>
+Date: Wed, 17 Jul 2024 16:01:48 +1000
+Subject: [PATCH] target/arm: Use FPST_F16 for SME FMOPA (widening)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This operation has float16 inputs and thus must use
+the FZ16 control not the FZ control.
+
+Cc: qemu-stable@nongnu.org
+Fixes: 3916841ac75 ("target/arm: Implement FMOPA, FMOPS (widening)")
+Reported-by: Daniyal Khan <danikhan632@gmail.com>
+Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
+Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Message-id: 20240717060149.204788-3-richard.henderson@linaro.org
+Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2374
+Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
+Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+(cherry picked from commit 207d30b5fdb5b45a36f26eefcf52fe2c1714dd4f)
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ target/arm/tcg/translate-sme.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/target/arm/tcg/translate-sme.c b/target/arm/tcg/translate-sme.c
+index 46c7fce8b4..185a8a917b 100644
+--- a/target/arm/tcg/translate-sme.c
+++ b/target/arm/tcg/translate-sme.c
+@@ -304,6 +304,7 @@ static bool do_outprod(DisasContext *s, arg_op *a, MemOp esz,
+ }
+ 
+ static bool do_outprod_fpst(DisasContext *s, arg_op *a, MemOp esz,
+                            ARMFPStatusFlavour e_fpst,
+                             gen_helper_gvec_5_ptr *fn)
+ {
+     int svl = streaming_vec_reg_size(s);
+@@ -319,15 +320,18 @@ static bool do_outprod_fpst(DisasContext *s, arg_op *a, MemOp esz,
+     zm = vec_full_reg_ptr(s, a->zm);
+     pn = pred_full_reg_ptr(s, a->pn);
+     pm = pred_full_reg_ptr(s, a->pm);
+-    fpst = fpstatus_ptr(FPST_FPCR);
+    fpst = fpstatus_ptr(e_fpst);
+ 
+     fn(za, zn, zm, pn, pm, fpst, tcg_constant_i32(desc));
+     return true;
+ }
+ 
+-TRANS_FEAT(FMOPA_h, aa64_sme, do_outprod_fpst, a, MO_32, gen_helper_sme_fmopa_h)
+-TRANS_FEAT(FMOPA_s, aa64_sme, do_outprod_fpst, a, MO_32, gen_helper_sme_fmopa_s)
+-TRANS_FEAT(FMOPA_d, aa64_sme_f64f64, do_outprod_fpst, a, MO_64, gen_helper_sme_fmopa_d)
+TRANS_FEAT(FMOPA_h, aa64_sme, do_outprod_fpst, a,
+           MO_32, FPST_FPCR_F16, gen_helper_sme_fmopa_h)
+TRANS_FEAT(FMOPA_s, aa64_sme, do_outprod_fpst, a,
+           MO_32, FPST_FPCR, gen_helper_sme_fmopa_s)
+TRANS_FEAT(FMOPA_d, aa64_sme_f64f64, do_outprod_fpst, a,
+           MO_64, FPST_FPCR, gen_helper_sme_fmopa_d)
+ 
+ /* TODO: FEAT_EBF16 */
+ TRANS_FEAT(BFMOPA, aa64_sme, do_outprod, a, MO_32, gen_helper_sme_bfmopa)
--- a/debian/patches/extra/0014-scsi-fix-regression-and-honor-bootindex-again-for-le.patch
+++ b/debian/patches/extra/0014-scsi-fix-regression-and-honor-bootindex-again-for-le.patch
@@ -0,0 +1,60 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fiona Ebner <f.ebner@proxmox.com>
+Date: Wed, 10 Jul 2024 17:25:29 +0200
+Subject: [PATCH] scsi: fix regression and honor bootindex again for legacy
+ drives
+
+Commit 3089637461 ("scsi: Don't ignore most usb-storage properties")
+removed the call to object_property_set_int() and thus the 'set'
+method for the bootindex property was also not called anymore. Here
+that method is device_set_bootindex() (as configured by
+scsi_dev_instance_init() -> device_add_bootindex_property()) which as
+a side effect registers the device via add_boot_device_path().
+
+As reported by a downstream user [0], the bootindex property did not
+have the desired effect anymore for legacy drives. Fix the regression
+by explicitly calling the add_boot_device_path() function after
+checking that the bootindex is not yet used (to avoid
+add_boot_device_path() calling exit()).
+
+[0]: https://forum.proxmox.com/threads/149772/post-679433
+
+Cc: qemu-stable@nongnu.org
+Fixes: 3089637461 ("scsi: Don't ignore most usb-storage properties")
+Suggested-by: Kevin Wolf <kwolf@redhat.com>
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+Link: https://lore.kernel.org/r/20240710152529.1737407-1-f.ebner@proxmox.com
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+(cherry picked from commit 57a8a80d1a5b28797b21d30bfc60601945820e51)
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ hw/scsi/scsi-bus.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
+index 9e40b0c920..53eff5dd3d 100644
+--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
+@@ -384,6 +384,7 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
+     DeviceState *dev;
+     SCSIDevice *s;
+     DriveInfo *dinfo;
+    Error *local_err = NULL;
+ 
+     if (blk_is_sg(blk)) {
+         driver = "scsi-generic";
+@@ -403,6 +404,14 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
+     s = SCSI_DEVICE(dev);
+     s->conf = *conf;
+ 
+    check_boot_index(conf->bootindex, &local_err);
+    if (local_err) {
+        object_unparent(OBJECT(dev));
+        error_propagate(errp, local_err);
+        return NULL;
+    }
+    add_boot_device_path(conf->bootindex, dev, NULL);
+
+     qdev_prop_set_uint32(dev, "scsi-id", unit);
+     if (object_property_find(OBJECT(dev), "removable")) {
+         qdev_prop_set_bit(dev, "removable", removable);
--- a/debian/patches/extra/0015-hw-scsi-lsi53c895a-bump-instruction-limit-in-scripts.patch
+++ b/debian/patches/extra/0015-hw-scsi-lsi53c895a-bump-instruction-limit-in-scripts.patch
@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fiona Ebner <f.ebner@proxmox.com>
+Date: Mon, 15 Jul 2024 15:14:03 +0200
+Subject: [PATCH] hw/scsi/lsi53c895a: bump instruction limit in scripts
+ processing to fix regression
+
+Commit 9876359990 ("hw/scsi/lsi53c895a: add timer to scripts
+processing") reduced the maximum allowed instruction count by
+a factor of 100 all the way down to 100.
+
+This causes the "Check Point R81.20 Gaia" appliance [0] to fail to
+boot after fully finishing the installation via the appliance's web
+interface (there is already one reboot before that).
+
+With a limit of 150, the appliance still fails to boot, while with a
+limit of 200, it works. Bump to 500 to fix the regression and be on
+the safe side.
+
+Originally reported in the Proxmox community forum[1].
+
+[0]: https://support.checkpoint.com/results/download/124397
+[1]: https://forum.proxmox.com/threads/149772/post-683459
+
+Cc: qemu-stable@nongnu.org
+Fixes: 9876359990 ("hw/scsi/lsi53c895a: add timer to scripts processing")
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+Acked-by: Sven Schnelle <svens@stackframe.org>
+Link: https://lore.kernel.org/r/20240715131403.223239-1-f.ebner@proxmox.com
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+(cherry picked from commit a4975023fb13cf229bd59c9ceec1b8cbdc5b9a20)
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ hw/scsi/lsi53c895a.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
+index eb9828dd5e..f1935e5328 100644
+--- a/hw/scsi/lsi53c895a.c
+++ b/hw/scsi/lsi53c895a.c
+@@ -188,7 +188,7 @@ static const char *names[] = {
+ #define LSI_TAG_VALID     (1 << 16)
+ 
+ /* Maximum instructions to process. */
+-#define LSI_MAX_INSN    100
+#define LSI_MAX_INSN    500
+ 
+ typedef struct lsi_request {
+     SCSIRequest *req;
--- a/debian/patches/extra/0016-block-copy-Fix-missing-graph-lock.patch
+++ b/debian/patches/extra/0016-block-copy-Fix-missing-graph-lock.patch
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kevin Wolf <kwolf@redhat.com>
+Date: Thu, 27 Jun 2024 20:12:44 +0200
+Subject: [PATCH] block-copy: Fix missing graph lock
+
+The graph lock needs to be held when calling bdrv_co_pdiscard(). Fix
+block_copy_task_entry() to take it for the call.
+
+WITH_GRAPH_RDLOCK_GUARD() was implemented in a weak way because of
+limitations in clang's Thread Safety Analysis at the time, so that it
+only asserts that the lock is held (which allows calling functions that
+require the lock), but we never deal with the unlocking (so even after
+the scope of the guard, the compiler assumes that the lock is still
+held). This is why the compiler didn't catch this locking error.
+
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+(picked from https://lore.kernel.org/qemu-devel/20240627181245.281403-2-kwolf@redhat.com/)
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ block/block-copy.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/block/block-copy.c b/block/block-copy.c
+index 7e3b378528..cc618e4561 100644
+--- a/block/block-copy.c
+++ b/block/block-copy.c
+@@ -595,7 +595,9 @@ static coroutine_fn int block_copy_task_entry(AioTask *task)
+     if (s->discard_source && ret == 0) {
+         int64_t nbytes =
+             MIN(t->req.offset + t->req.bytes, s->len) - t->req.offset;
+-        bdrv_co_pdiscard(s->source, t->req.offset, nbytes);
+        WITH_GRAPH_RDLOCK_GUARD() {
+            bdrv_co_pdiscard(s->source, t->req.offset, nbytes);
+        }
+     }
+ 
+     return ret;
--- a/debian/patches/extra/0017-Revert-qemu-char-do-not-operate-on-sources-from-fina.patch
+++ b/debian/patches/extra/0017-Revert-qemu-char-do-not-operate-on-sources-from-fina.patch
@@ -0,0 +1,93 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Sergey Dyasli <sergey.dyasli@nutanix.com>
+Date: Fri, 12 Jul 2024 09:26:59 +0000
+Subject: [PATCH] Revert "qemu-char: do not operate on sources from finalize
+ callbacks"
+
+This reverts commit 2b316774f60291f57ca9ecb6a9f0712c532cae34.
+
+After 038b4217884c ("Revert "chardev: use a child source for qio input
+source"") we've been observing the "iwp->src == NULL" assertion
+triggering periodically during the initial capabilities querying by
+libvirtd. One of possible backtraces:
+
+Thread 1 (Thread 0x7f16cd4f0700 (LWP 43858)):
+0  __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50
+1  0x00007f16c6c21e65 in __GI_abort () at abort.c:79
+2  0x00007f16c6c21d39 in __assert_fail_base  at assert.c:92
+3  0x00007f16c6c46e86 in __GI___assert_fail (assertion=assertion@entry=0x562e9bcdaadd "iwp->src == NULL", file=file@entry=0x562e9bcdaac8 "../chardev/char-io.c", line=line@entry=99, function=function@entry=0x562e9bcdab10 <__PRETTY_FUNCTION__.20549> "io_watch_poll_finalize") at assert.c:101
+4  0x0000562e9ba20c2c in io_watch_poll_finalize (source=<optimized out>) at ../chardev/char-io.c:99
+5  io_watch_poll_finalize (source=<optimized out>) at ../chardev/char-io.c:88
+6  0x00007f16c904aae0 in g_source_unref_internal () from /lib64/libglib-2.0.so.0
+7  0x00007f16c904baf9 in g_source_destroy_internal () from /lib64/libglib-2.0.so.0
+8  0x0000562e9ba20db0 in io_remove_watch_poll (source=0x562e9d6720b0) at ../chardev/char-io.c:147
+9  remove_fd_in_watch (chr=chr@entry=0x562e9d5f3800) at ../chardev/char-io.c:153
+10 0x0000562e9ba23ffb in update_ioc_handlers (s=0x562e9d5f3800) at ../chardev/char-socket.c:592
+11 0x0000562e9ba2072f in qemu_chr_fe_set_handlers_full at ../chardev/char-fe.c:279
+12 0x0000562e9ba207a9 in qemu_chr_fe_set_handlers at ../chardev/char-fe.c:304
+13 0x0000562e9ba2ca75 in monitor_qmp_setup_handlers_bh (opaque=0x562e9d4c2c60) at ../monitor/qmp.c:509
+14 0x0000562e9bb6222e in aio_bh_poll (ctx=ctx@entry=0x562e9d4c2f20) at ../util/async.c:216
+15 0x0000562e9bb4de0a in aio_poll (ctx=0x562e9d4c2f20, blocking=blocking@entry=true) at ../util/aio-posix.c:722
+16 0x0000562e9b99dfaa in iothread_run (opaque=0x562e9d4c26f0) at ../iothread.c:63
+17 0x0000562e9bb505a4 in qemu_thread_start (args=0x562e9d4c7ea0) at ../util/qemu-thread-posix.c:543
+18 0x00007f16c70081ca in start_thread (arg=<optimized out>) at pthread_create.c:479
+19 0x00007f16c6c398d3 in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95
+
+io_remove_watch_poll(), which makes sure that iwp->src is NULL, calls
+g_source_destroy() which finds that iwp->src is not NULL in the finalize
+callback. This can only happen if another thread has managed to trigger
+io_watch_poll_prepare() callback in the meantime.
+
+Move iwp->src destruction back to the finalize callback to prevent the
+described race, and also remove the stale comment. The deadlock glib bug
+was fixed back in 2010 by b35820285668 ("gmain: move finalization of
+GSource outside of context lock").
+
+Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Sergey Dyasli <sergey.dyasli@nutanix.com>
+Link: https://lore.kernel.org/r/20240712092659.216206-1-sergey.dyasli@nutanix.com
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+(cherry picked from commit e0bf95443ee9326d44031373420cf9f3513ee255)
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ chardev/char-io.c | 19 +++++--------------
+ 1 file changed, 5 insertions(+), 14 deletions(-)
+
+diff --git a/chardev/char-io.c b/chardev/char-io.c
+index dab77b112e..3be17b51ca 100644
+--- a/chardev/char-io.c
+++ b/chardev/char-io.c
+@@ -87,16 +87,12 @@ static gboolean io_watch_poll_dispatch(GSource *source, GSourceFunc callback,
+ 
+ static void io_watch_poll_finalize(GSource *source)
+ {
+-    /*
+-     * Due to a glib bug, removing the last reference to a source
+-     * inside a finalize callback causes recursive locking (and a
+-     * deadlock).  This is not a problem inside other callbacks,
+-     * including dispatch callbacks, so we call io_remove_watch_poll
+-     * to remove this source.  At this point, iwp->src must
+-     * be NULL, or we would leak it.
+-     */
+     IOWatchPoll *iwp = io_watch_poll_from_source(source);
+-    assert(iwp->src == NULL);
+    if (iwp->src) {
+        g_source_destroy(iwp->src);
+        g_source_unref(iwp->src);
+        iwp->src = NULL;
+    }
+ }
+ 
+ static GSourceFuncs io_watch_poll_funcs = {
+@@ -139,11 +135,6 @@ static void io_remove_watch_poll(GSource *source)
+     IOWatchPoll *iwp;
+ 
+     iwp = io_watch_poll_from_source(source);
+-    if (iwp->src) {
+-        g_source_destroy(iwp->src);
+-        g_source_unref(iwp->src);
+-        iwp->src = NULL;
+-    }
+     g_source_destroy(&iwp->parent);
+ }
+ 
--- a/debian/patches/pve-qemu-9.0-vitastor.patch
+++ b/debian/patches/pve-qemu-9.0-vitastor.patch
--- a/debian/patches/pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch
+++ b/debian/patches/pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch
@@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/block/file-posix.c b/block/file-posix.c
-index 90fa54352c..e2ea071315 100644
+index 35684f7e21..43bc0bd520 100644
 --- a/block/file-posix.c
 +++ b/block/file-posix.c
-@@ -564,7 +564,7 @@ static QemuOptsList raw_runtime_opts = {
+@@ -563,7 +563,7 @@ static QemuOptsList raw_runtime_opts = {
         {
             .name = "locking",
             .type = QEMU_OPT_STRING,
@@ -26,7 +26,7 @@ index 90fa54352c..e2ea071315 100644
         },
         {
             .name = "pr-manager",
-@@ -664,7 +664,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
+@@ -663,7 +663,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
         s->use_lock = false;
         break;
     case ON_OFF_AUTO_AUTO:
--- a/debian/patches/pve/0002-PVE-Config-Adjust-network-script-path-to-etc-kvm.patch
+++ b/debian/patches/pve/0002-PVE-Config-Adjust-network-script-path-to-etc-kvm.patch
@@ -9,12 +9,12 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/include/net/net.h b/include/net/net.h
-index cdd5b109b0..653a37e9d1 100644
+index b1f9b35fcc..096c0d52e4 100644
 --- a/include/net/net.h
 +++ b/include/net/net.h
-@@ -305,8 +305,8 @@ void netdev_add(QemuOpts *opts, Error **errp);
- 
+@@ -317,8 +317,8 @@ void netdev_add(QemuOpts *opts, Error **errp);
 int net_hub_id_for_client(NetClientState *nc, int *id);
+ NetClientState *net_hub_port_find(int hub_id);
 
 -#define DEFAULT_NETWORK_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifup"
 -#define DEFAULT_NETWORK_DOWN_SCRIPT CONFIG_SYSCONFDIR "/qemu-ifdown"
--- a/debian/patches/pve/0003-PVE-Config-set-the-CPU-model-to-kvm64-32-instead-of-.patch
+++ b/debian/patches/pve/0003-PVE-Config-set-the-CPU-model-to-kvm64-32-instead-of-.patch
@@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/target/i386/cpu.h b/target/i386/cpu.h
-index 4c239a6970..be09263fb0 100644
+index 6b05738079..d82869900a 100644
 --- a/target/i386/cpu.h
 +++ b/target/i386/cpu.h
-@@ -2475,9 +2475,9 @@ uint64_t cpu_get_tsc(CPUX86State *env);
+@@ -2291,9 +2291,9 @@ uint64_t cpu_get_tsc(CPUX86State *env);
 #define CPU_RESOLVING_TYPE TYPE_X86_CPU
 
 #ifdef TARGET_X86_64
--- a/debian/patches/pve/0004-PVE-Config-ui-spice-default-to-pve-certificates.patch
+++ b/debian/patches/pve/0004-PVE-Config-ui-spice-default-to-pve-certificates.patch
@@ -9,7 +9,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 9 insertions(+), 6 deletions(-)

 diff --git a/ui/spice-core.c b/ui/spice-core.c
-index bd9dbe03f1..a7ecaad9c7 100644
+index 15be640286..ea20e6153c 100644
 --- a/ui/spice-core.c
 +++ b/ui/spice-core.c
@@ -690,32 +690,35 @@ static void qemu_spice_init(void)
--- a/debian/patches/pve/0005-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch
+++ b/debian/patches/pve/0005-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch
@@ -9,10 +9,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 11 insertions(+), 4 deletions(-)

 diff --git a/block/gluster.c b/block/gluster.c
-index e9c038042b..c8457a5014 100644
+index cc74af06dc..3ba9bbfa5e 100644
 --- a/block/gluster.c
 +++ b/block/gluster.c
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,7 @@
 #define GLUSTER_DEBUG_DEFAULT       4
 #define GLUSTER_DEBUG_MAX           9
 #define GLUSTER_OPT_LOGFILE         "logfile"
@@ -21,7 +21,7 @@ index e9c038042b..c8457a5014 100644
 /*
  * Several versions of GlusterFS (3.12? -> 6.0.1) fail when the transfer size
  * is greater or equal to 1024 MiB, so we are limiting the transfer size to 512
-@@ -421,6 +421,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
+@@ -425,6 +425,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
     int old_errno;
     SocketAddressList *server;
     uint64_t port;
@@ -29,7 +29,7 @@ index e9c038042b..c8457a5014 100644
 
     glfs = glfs_find_preopened(gconf->volume);
     if (glfs) {
-@@ -463,9 +464,15 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
+@@ -467,9 +468,15 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
         }
     }
 
--- a/debian/patches/pve/0006-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch
+++ b/debian/patches/pve/0006-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch
@@ -18,7 +18,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 2 insertions(+)

 diff --git a/block/rbd.c b/block/rbd.c
-index 04ed0e242e..728bce3b1e 100644
+index 84bb2fa5d7..63f60d41be 100644
 --- a/block/rbd.c
 +++ b/block/rbd.c
@@ -963,6 +963,8 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
--- a/debian/patches/pve/0007-PVE-Up-glusterfs-allow-partial-reads.patch
+++ b/debian/patches/pve/0007-PVE-Up-glusterfs-allow-partial-reads.patch
@@ -16,10 +16,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 9 insertions(+), 1 deletion(-)

 diff --git a/block/gluster.c b/block/gluster.c
-index c8457a5014..c3a9555591 100644
+index 3ba9bbfa5e..34936eb855 100644
 --- a/block/gluster.c
 +++ b/block/gluster.c
-@@ -57,6 +57,7 @@ typedef struct GlusterAIOCB {
+@@ -58,6 +58,7 @@ typedef struct GlusterAIOCB {
     int ret;
     Coroutine *coroutine;
     AioContext *aio_context;
@@ -27,7 +27,7 @@ index c8457a5014..c3a9555591 100644
 } GlusterAIOCB;
 
 typedef struct BDRVGlusterState {
-@@ -746,8 +747,10 @@ static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret,
+@@ -753,8 +754,10 @@ static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret,
         acb->ret = 0; /* Success */
     } else if (ret < 0) {
         acb->ret = -errno; /* Read/Write failed */
@@ -39,7 +39,7 @@ index c8457a5014..c3a9555591 100644
     }
 
     aio_co_schedule(acb->aio_context, acb->coroutine);
-@@ -1018,6 +1021,7 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs,
+@@ -1023,6 +1026,7 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs,
     acb.ret = 0;
     acb.coroutine = qemu_coroutine_self();
     acb.aio_context = bdrv_get_aio_context(bs);
@@ -47,7 +47,7 @@ index c8457a5014..c3a9555591 100644
 
     ret = glfs_zerofill_async(s->fd, offset, bytes, gluster_finish_aiocb, &acb);
     if (ret < 0) {
-@@ -1198,9 +1202,11 @@ static coroutine_fn int qemu_gluster_co_rw(BlockDriverState *bs,
+@@ -1203,9 +1207,11 @@ static coroutine_fn int qemu_gluster_co_rw(BlockDriverState *bs,
     acb.aio_context = bdrv_get_aio_context(bs);
 
     if (write) {
@@ -59,7 +59,7 @@ index c8457a5014..c3a9555591 100644
         ret = glfs_preadv_async(s->fd, qiov->iov, qiov->niov, offset, 0,
                                 gluster_finish_aiocb, &acb);
     }
-@@ -1263,6 +1269,7 @@ static coroutine_fn int qemu_gluster_co_flush_to_disk(BlockDriverState *bs)
+@@ -1268,6 +1274,7 @@ static coroutine_fn int qemu_gluster_co_flush_to_disk(BlockDriverState *bs)
     acb.ret = 0;
     acb.coroutine = qemu_coroutine_self();
     acb.aio_context = bdrv_get_aio_context(bs);
@@ -67,7 +67,7 @@ index c8457a5014..c3a9555591 100644
 
     ret = glfs_fsync_async(s->fd, gluster_finish_aiocb, &acb);
     if (ret < 0) {
-@@ -1311,6 +1318,7 @@ static coroutine_fn int qemu_gluster_co_pdiscard(BlockDriverState *bs,
+@@ -1316,6 +1323,7 @@ static coroutine_fn int qemu_gluster_co_pdiscard(BlockDriverState *bs,
     acb.ret = 0;
     acb.coroutine = qemu_coroutine_self();
     acb.aio_context = bdrv_get_aio_context(bs);
--- a/debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch
+++ b/debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch
@@ -18,10 +18,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 4 files changed, 82 insertions(+), 4 deletions(-)

 diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c
-index 8701f00cc7..3b4c5ef403 100644
+index a6ff6a4875..e7f74d1c63 100644
 --- a/hw/core/machine-hmp-cmds.c
 +++ b/hw/core/machine-hmp-cmds.c
-@@ -179,7 +179,35 @@ void hmp_info_balloon(Monitor *mon, const QDict *qdict)
+@@ -175,7 +175,35 @@ void hmp_info_balloon(Monitor *mon, const QDict *qdict)
         return;
     }
 
@@ -59,10 +59,10 @@ index 8701f00cc7..3b4c5ef403 100644
     qapi_free_BalloonInfo(info);
 }
 diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
-index afd2ad6dd6..c724218c17 100644
+index 609e39a821..8cb6dfcac3 100644
 --- a/hw/virtio/virtio-balloon.c
 +++ b/hw/virtio/virtio-balloon.c
-@@ -795,8 +795,37 @@ static uint64_t virtio_balloon_get_features(VirtIODevice *vdev, uint64_t f,
+@@ -781,8 +781,37 @@ static uint64_t virtio_balloon_get_features(VirtIODevice *vdev, uint64_t f,
 static void virtio_balloon_stat(void *opaque, BalloonInfo *info)
 {
     VirtIOBalloon *dev = opaque;
@@ -103,10 +103,10 @@ index afd2ad6dd6..c724218c17 100644
 
 static void virtio_balloon_to_target(void *opaque, ram_addr_t target)
 diff --git a/qapi/machine.json b/qapi/machine.json
-index a6b8795b09..9f7ed0eaa0 100644
+index e8b60641f2..2054cdc70d 100644
 --- a/qapi/machine.json
 +++ b/qapi/machine.json
-@@ -1163,9 +1163,29 @@
+@@ -1079,9 +1079,29 @@
 # @actual: the logical size of the VM in bytes Formula used:
 #     logical_vm_size = vm_ram_size - balloon_size
 #
@@ -138,10 +138,10 @@ index a6b8795b09..9f7ed0eaa0 100644
 ##
 # @query-balloon:
 diff --git a/qapi/pragma.json b/qapi/pragma.json
-index 023a2ef7bc..6aaa9cb975 100644
+index 59fbe74b8c..be8fa304c5 100644
 --- a/qapi/pragma.json
 +++ b/qapi/pragma.json
-@@ -81,6 +81,7 @@
+@@ -90,6 +90,7 @@
     'member-name-exceptions': [     # visible in:
         'ACPISlotType',             # query-acpi-ospm-status
         'AcpiTableOptions',         # -acpitable
--- a/debian/patches/pve/0014-PVE-qapi-modify-query-machines.patch
+++ b/debian/patches/pve/0014-PVE-qapi-modify-query-machines.patch
@@ -13,10 +13,10 @@ Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
 2 files changed, 9 insertions(+), 1 deletion(-)

 diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
-index 130217da8f..52a6d74820 100644
+index 4b72009cd3..314351cdff 100644
 --- a/hw/core/machine-qmp-cmds.c
 +++ b/hw/core/machine-qmp-cmds.c
-@@ -90,6 +90,12 @@ MachineInfoList *qmp_query_machines(bool has_compat_props, bool compat_props,
+@@ -90,6 +90,12 @@ MachineInfoList *qmp_query_machines(Error **errp)
         info->numa_mem_supported = mc->numa_mem_supported;
         info->deprecated = !!mc->deprecation_reason;
         info->acpi = !!object_class_property_find(OBJECT_CLASS(mc), "acpi");
@@ -30,10 +30,10 @@ index 130217da8f..52a6d74820 100644
             info->default_cpu_type = g_strdup(mc->default_cpu_type);
         }
 diff --git a/qapi/machine.json b/qapi/machine.json
-index 9f7ed0eaa0..16366b774a 100644
+index 2054cdc70d..a024d5b05d 100644
 --- a/qapi/machine.json
 +++ b/qapi/machine.json
-@@ -167,6 +167,8 @@
+@@ -146,6 +146,8 @@
 #
 # @is-default: whether the machine is default
 #
@@ -42,7 +42,7 @@ index 9f7ed0eaa0..16366b774a 100644
 # @cpu-max: maximum number of CPUs supported by the machine type
 #     (since 1.5)
 #
-@@ -199,7 +201,7 @@
+@@ -170,7 +172,7 @@
 ##
 { 'struct': 'MachineInfo',
   'data': { 'name': 'str', '*alias': 'str',
@@ -50,4 +50,4 @@ index 9f7ed0eaa0..16366b774a 100644
 +            '*is-default': 'bool', '*is-current': 'bool', 'cpu-max': 'int',
             'hotpluggable-cpus': 'bool',  'numa-mem-supported': 'bool',
             'deprecated': 'bool', '*default-cpu-type': 'str',
-             '*default-ram-id': 'str', 'acpi': 'bool',
+             '*default-ram-id': 'str', 'acpi': 'bool' } }
--- a/debian/patches/pve/0015-PVE-qapi-modify-spice-query.patch
+++ b/debian/patches/pve/0015-PVE-qapi-modify-spice-query.patch
@@ -14,10 +14,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 2 files changed, 7 insertions(+)

 diff --git a/qapi/ui.json b/qapi/ui.json
-index 460a26b981..42b911bda3 100644
+index f610bce118..6ea26a9acb 100644
 --- a/qapi/ui.json
 +++ b/qapi/ui.json
-@@ -312,11 +312,14 @@
+@@ -314,11 +314,14 @@
 #
 # @channels: a list of @SpiceChannel for each active spice channel
 #
@@ -33,7 +33,7 @@ index 460a26b981..42b911bda3 100644
   'if': 'CONFIG_SPICE' }
 
 diff --git a/ui/spice-core.c b/ui/spice-core.c
-index a7ecaad9c7..fecf002d50 100644
+index ea20e6153c..55a15fba8b 100644
 --- a/ui/spice-core.c
 +++ b/ui/spice-core.c
@@ -548,6 +548,10 @@ static SpiceInfo *qmp_query_spice_real(Error **errp)
--- a/debian/patches/pve/0016-PVE-add-IOChannel-implementation-for-savevm-async.patch
+++ b/debian/patches/pve/0016-PVE-add-IOChannel-implementation-for-savevm-async.patch
@@ -271,7 +271,7 @@ index 0000000000..17ae2cb261
 +
 +#endif /* QIO_CHANNEL_SAVEVM_ASYNC_H */
 diff --git a/migration/meson.build b/migration/meson.build
-index d53cf3417a..b00d58064d 100644
+index 1eeb915ff6..95d1cf2250 100644
 --- a/migration/meson.build
 +++ b/migration/meson.build
@@ -13,6 +13,7 @@ system_ss.add(files(
@@ -279,6 +279,6 @@ index d53cf3417a..b00d58064d 100644
   'channel.c',
   'channel-block.c',
 +  'channel-savevm-async.c',
-   'cpu-throttle.c',
   'dirtyrate.c',
   'exec.c',
+   'fd.c',
--- a/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch
+++ b/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch
@@ -28,9 +28,7 @@ Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
     adapt to removal of QEMUFileOps
     improve condition for entering final stage
     adapt to QAPI and other changes for 8.2
-     make sure to not call vm_start() from coroutine
-     stop CPU throttling after finishing
-     force raw format when loading state as suggested by Friedrich Weber]
+     make sure to not call vm_start() from coroutine]
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
 hmp-commands-info.hx         |  13 +
@@ -38,20 +36,20 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 include/migration/snapshot.h |   2 +
 include/monitor/hmp.h        |   3 +
 migration/meson.build        |   1 +
- migration/savevm-async.c     | 571 +++++++++++++++++++++++++++++++++++
+ migration/savevm-async.c     | 538 +++++++++++++++++++++++++++++++++++
 monitor/hmp-cmds.c           |  38 +++
 qapi/migration.json          |  34 +++
 qapi/misc.json               |  18 ++
 qemu-options.hx              |  12 +
 system/vl.c                  |  10 +
- 11 files changed, 719 insertions(+)
+ 11 files changed, 686 insertions(+)
 create mode 100644 migration/savevm-async.c

 diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
-index c59cd6637b..d1a7b99add 100644
+index ad1b1306e3..d5ab880492 100644
 --- a/hmp-commands-info.hx
 +++ b/hmp-commands-info.hx
-@@ -512,6 +512,19 @@ SRST
+@@ -525,6 +525,19 @@ SRST
     Show current migration parameters.
 ERST
 
@@ -72,10 +70,10 @@ index c59cd6637b..d1a7b99add 100644
         .name       = "balloon",
         .args_type  = "",
 diff --git a/hmp-commands.hx b/hmp-commands.hx
-index 06746f0afc..0c7c6f2c16 100644
+index 2e2a3bcf98..7506de251c 100644
 --- a/hmp-commands.hx
 +++ b/hmp-commands.hx
-@@ -1859,3 +1859,20 @@ SRST
+@@ -1862,3 +1862,20 @@ SRST
   List event channels in the guest
 ERST
 #endif
@@ -108,7 +106,7 @@ index 9e4dcaaa75..2581730d74 100644
 +
 #endif
 diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
-index ae116d9804..2596cc2426 100644
+index 13f9a2dedb..7a7def7530 100644
 --- a/include/monitor/hmp.h
 +++ b/include/monitor/hmp.h
@@ -28,6 +28,7 @@ void hmp_info_status(Monitor *mon, const QDict *qdict);
@@ -119,7 +117,7 @@ index ae116d9804..2596cc2426 100644
 void hmp_info_migrate(Monitor *mon, const QDict *qdict);
 void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);
 void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict);
-@@ -92,6 +93,8 @@ void hmp_closefd(Monitor *mon, const QDict *qdict);
+@@ -94,6 +95,8 @@ void hmp_closefd(Monitor *mon, const QDict *qdict);
 void hmp_mouse_move(Monitor *mon, const QDict *qdict);
 void hmp_mouse_button(Monitor *mon, const QDict *qdict);
 void hmp_mouse_set(Monitor *mon, const QDict *qdict);
@@ -129,10 +127,10 @@ index ae116d9804..2596cc2426 100644
 void coroutine_fn hmp_screendump(Monitor *mon, const QDict *qdict);
 void hmp_chardev_add(Monitor *mon, const QDict *qdict);
 diff --git a/migration/meson.build b/migration/meson.build
-index b00d58064d..075b013971 100644
+index 95d1cf2250..800f12a60d 100644
 --- a/migration/meson.build
 +++ b/migration/meson.build
-@@ -29,6 +29,7 @@ system_ss.add(files(
+@@ -28,6 +28,7 @@ system_ss.add(files(
   'options.c',
   'postcopy-ram.c',
   'savevm.c',
@@ -142,10 +140,10 @@ index b00d58064d..075b013971 100644
   'threadinfo.c',
 diff --git a/migration/savevm-async.c b/migration/savevm-async.c
 new file mode 100644
-index 0000000000..ee8ef316d0
+index 0000000000..72cf6588c2
 --- /dev/null
 +++ b/migration/savevm-async.c
-@@ -0,0 +1,571 @@
+@@ -0,0 +1,538 @@
 +#include "qemu/osdep.h"
 +#include "migration/channel-savevm-async.h"
 +#include "migration/migration.h"
@@ -156,7 +154,6 @@ index 0000000000..ee8ef316d0
 +#include "migration/global_state.h"
 +#include "migration/ram.h"
 +#include "migration/qemu-file.h"
-+#include "sysemu/cpu-throttle.h"
 +#include "sysemu/sysemu.h"
 +#include "sysemu/runstate.h"
 +#include "block/block.h"
@@ -168,7 +165,6 @@ index 0000000000..ee8ef316d0
 +#include "qapi/qapi-commands-misc.h"
 +#include "qapi/qapi-commands-block.h"
 +#include "qemu/cutils.h"
-+#include "qemu/error-report.h"
 +#include "qemu/timer.h"
 +#include "qemu/main-loop.h"
 +#include "qemu/rcu.h"
@@ -262,7 +258,6 @@ index 0000000000..ee8ef316d0
 +    }
 +
 +    if (snap_state.target) {
-+        BlockDriverState *target_bs = blk_bs(snap_state.target);
 +        if (!savevm_aborted()) {
 +            /* try to truncate, but ignore errors (will fail on block devices).
 +            * note1: bdrv_read() need whole blocks, so we need to round up
@@ -271,9 +266,7 @@ index 0000000000..ee8ef316d0
 +            size_t size = QEMU_ALIGN_UP(snap_state.bs_pos, BDRV_SECTOR_SIZE*2);
 +            blk_truncate(snap_state.target, size, false, PREALLOC_MODE_OFF, 0, NULL);
 +        }
-+        if (target_bs) {
-+            bdrv_op_unblock_all(target_bs, snap_state.blocker);
-+        }
+        blk_op_unblock_all(snap_state.target, snap_state.blocker);
 +        error_free(snap_state.blocker);
 +        snap_state.blocker = NULL;
 +        blk_unref(snap_state.target);
@@ -297,7 +290,7 @@ index 0000000000..ee8ef316d0
 +    DPRINTF("save_snapshot_error: %s\n", msg);
 +
 +    if (!snap_state.error) {
-+        error_setg(&snap_state.error, "%s", msg);
+        error_set(&snap_state.error, ERROR_CLASS_GENERIC_ERROR, "%s", msg);
 +    }
 +
 +    g_free (msg);
@@ -349,12 +342,6 @@ index 0000000000..ee8ef316d0
 +        ret || aborted ? MIGRATION_STATUS_FAILED : MIGRATION_STATUS_COMPLETED);
 +    ms->to_dst_file = NULL;
 +
-+    /*
-+     * Same as in migration_iteration_finish(): saving RAM might've turned on CPU throttling for
-+     * auto-converge, make sure to disable it.
-+     */
-+    cpu_throttle_stop();
-+
 +    qemu_savevm_state_cleanup();
 +
 +    ret = save_snapshot_cleanup();
@@ -484,18 +471,23 @@ index 0000000000..ee8ef316d0
 +    Error *local_err = NULL;
 +    MigrationState *ms = migrate_get_current();
 +    AioContext *iohandler_ctx = iohandler_get_aio_context();
-+    BlockDriverState *target_bs = NULL;
-+    int ret = 0;
 +
 +    int bdrv_oflags = BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_NO_FLUSH;
 +
 +    if (snap_state.state != SAVE_STATE_DONE) {
-+        error_setg(errp, "VM snapshot already started\n");
+        error_set(errp, ERROR_CLASS_GENERIC_ERROR,
+                  "VM snapshot already started\n");
 +        return;
 +    }
 +
 +    if (migration_is_running()) {
-+        error_setg(errp, "There's a migration process in progress");
+        error_set(errp, ERROR_CLASS_GENERIC_ERROR, QERR_MIGRATION_ACTIVE);
+        return;
+    }
+
+    if (migrate_block()) {
+        error_set(errp, ERROR_CLASS_GENERIC_ERROR,
+                  "Block migration and snapshots are incompatible");
 +        return;
 +    }
 +
@@ -527,12 +519,7 @@ index 0000000000..ee8ef316d0
 +    qdict_put_str(options, "driver", "raw");
 +    snap_state.target = blk_new_open(statefile, NULL, options, bdrv_oflags, &local_err);
 +    if (!snap_state.target) {
-+        error_setg(errp, "failed to open '%s'", statefile);
-+        goto restart;
-+    }
-+    target_bs = blk_bs(snap_state.target);
-+    if (!target_bs) {
-+        error_setg(errp, "failed to open '%s' - no block driver state", statefile);
+        error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile);
 +        goto restart;
 +    }
 +
@@ -541,7 +528,7 @@ index 0000000000..ee8ef316d0
 +    snap_state.file = qemu_file_new_output(ioc);
 +
 +    if (!snap_state.file) {
-+        error_setg(errp, "failed to open '%s'", statefile);
+        error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile);
 +        goto restart;
 +    }
 +
@@ -557,29 +544,19 @@ index 0000000000..ee8ef316d0
 +    ms->to_dst_file = snap_state.file;
 +
 +    error_setg(&snap_state.blocker, "block device is in use by savevm");
-+    bdrv_op_block_all(target_bs, snap_state.blocker);
+    blk_op_block_all(snap_state.target, snap_state.blocker);
 +
 +    snap_state.state = SAVE_STATE_ACTIVE;
 +    snap_state.finalize_bh = qemu_bh_new(process_savevm_finalize, &snap_state);
+    snap_state.co = qemu_coroutine_create(&process_savevm_co, NULL);
 +    qemu_savevm_state_header(snap_state.file);
-+    ret = qemu_savevm_state_setup(snap_state.file, &local_err);
-+    if (ret != 0) {
-+        error_setg_errno(errp, -ret, "savevm state setup failed: %s",
-+                         local_err ? error_get_pretty(local_err) : "unknown error");
-+        return;
-+    }
+    qemu_savevm_state_setup(snap_state.file);
 +
 +    /* Async processing from here on out happens in iohandler context, so let
 +     * the target bdrv have its home there.
 +     */
-+    ret = blk_set_aio_context(snap_state.target, iohandler_ctx, &local_err);
-+    if (ret != 0) {
-+        warn_report("failed to set iohandler context for VM state target: %s %s",
-+                    local_err ? error_get_pretty(local_err) : "unknown error",
-+                    strerror(-ret));
-+    }
+    blk_set_aio_context(snap_state.target, iohandler_ctx, &local_err);
 +
-+    snap_state.co = qemu_coroutine_create(&process_savevm_co, NULL);
 +    aio_co_schedule(iohandler_ctx, snap_state.co);
 +
 +    return;
@@ -628,7 +605,8 @@ index 0000000000..ee8ef316d0
 +void qmp_savevm_end(Error **errp)
 +{
 +    if (snap_state.state == SAVE_STATE_DONE) {
-+        error_setg(errp, "VM snapshot not started\n");
+        error_set(errp, ERROR_CLASS_GENERIC_ERROR,
+                  "VM snapshot not started\n");
 +        return;
 +    }
 +
@@ -653,33 +631,22 @@ index 0000000000..ee8ef316d0
 +int load_snapshot_from_blockdev(const char *filename, Error **errp)
 +{
 +    BlockBackend *be;
-+    BlockDriverState *bs = NULL;
 +    Error *local_err = NULL;
 +    Error *blocker = NULL;
-+    QDict *options;
 +
 +    QEMUFile *f;
 +    size_t bs_pos = 0;
 +    int ret = -EINVAL;
 +
-+    options = qdict_new();
-+    qdict_put_str(options, "driver", "raw");
-+
-+    be = blk_new_open(filename, NULL, options, 0, &local_err);
+    be = blk_new_open(filename, NULL, NULL, 0, &local_err);
 +
 +    if (!be) {
 +        error_setg(errp, "Could not open VM state file");
 +        goto the_end;
 +    }
 +
-+    bs = blk_bs(be);
-+    if (!bs) {
-+        error_setg(errp, "Could not open VM state file - missing block driver state");
-+        goto the_end;
-+    }
-+
 +    error_setg(&blocker, "block device is in use by load state");
-+    bdrv_op_block_all(bs, blocker);
+    blk_op_block_all(be, blocker);
 +
 +    /* restore the VM state */
 +    f = qemu_file_new_input(QIO_CHANNEL(qio_channel_savevm_async_new(be, &bs_pos)));
@@ -709,30 +676,28 @@ index 0000000000..ee8ef316d0
 +
 + the_end:
 +    if (be) {
-+        if (bs) {
-+            bdrv_op_unblock_all(bs, blocker);
-+        }
+        blk_op_unblock_all(be, blocker);
 +        error_free(blocker);
 +        blk_unref(be);
 +    }
 +    return ret;
 +}
 diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
-index f601d06ab8..874084565f 100644
+index 871898ac46..ef4634e5c1 100644
 --- a/monitor/hmp-cmds.c
 +++ b/monitor/hmp-cmds.c
-@@ -24,6 +24,7 @@
+@@ -22,6 +22,7 @@
+ #include "monitor/monitor-internal.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-control.h"
- #include "qapi/qapi-commands-machine.h"
 +#include "qapi/qapi-commands-migration.h"
 #include "qapi/qapi-commands-misc.h"
 #include "qapi/qmp/qdict.h"
 #include "qemu/cutils.h"
-@@ -434,3 +435,40 @@ void hmp_dumpdtb(Monitor *mon, const QDict *qdict)
-     monitor_printf(mon, "dtb dumped to %s", filename);
+@@ -443,3 +444,40 @@ void hmp_info_mtree(Monitor *mon, const QDict *qdict)
+ 
+     mtree_info(flatview, dispatch_tree, owner, disabled);
 }
- #endif
 +
 +void hmp_savevm_start(Monitor *mon, const QDict *qdict)
 +{
@@ -771,10 +736,10 @@ index f601d06ab8..874084565f 100644
 +    }
 +}
 diff --git a/qapi/migration.json b/qapi/migration.json
-index a605dc26db..927b1e1c7d 100644
+index 8c65b90328..ed20d066cd 100644
 --- a/qapi/migration.json
 +++ b/qapi/migration.json
-@@ -276,6 +276,40 @@
+@@ -297,6 +297,40 @@
            '*dirty-limit-throttle-time-per-round': 'uint64',
            '*dirty-limit-ring-full-time': 'uint64'} }
 
@@ -816,7 +781,7 @@ index a605dc26db..927b1e1c7d 100644
 # @query-migrate:
 #
 diff --git a/qapi/misc.json b/qapi/misc.json
-index 559b66f201..7959e89c1e 100644
+index ec30e5c570..3c68633f68 100644
 --- a/qapi/misc.json
 +++ b/qapi/misc.json
@@ -454,6 +454,24 @@
@@ -845,10 +810,10 @@ index 559b66f201..7959e89c1e 100644
 # @CommandLineParameterType:
 #
 diff --git a/qemu-options.hx b/qemu-options.hx
-index dacc9790a4..c05f411599 100644
+index 8ce85d4559..511ab9415e 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
-@@ -4764,6 +4764,18 @@ SRST
+@@ -4610,6 +4610,18 @@ SRST
     Start right away with a saved state (``loadvm`` in monitor)
 ERST
 
@@ -868,10 +833,10 @@ index dacc9790a4..c05f411599 100644
 DEF("daemonize", 0, QEMU_OPTION_daemonize, \
     "-daemonize      daemonize QEMU after initializing\n", QEMU_ARCH_ALL)
 diff --git a/system/vl.c b/system/vl.c
-index 2f855d83fb..39d451bb41 100644
+index c644222982..2738ab7c91 100644
 --- a/system/vl.c
 +++ b/system/vl.c
-@@ -164,6 +164,7 @@ static const char *accelerators;
+@@ -163,6 +163,7 @@ static const char *accelerators;
 static bool have_custom_ram_size;
 static const char *ram_memdev_id;
 static QDict *machine_opts_dict;
@@ -879,7 +844,7 @@ index 2f855d83fb..39d451bb41 100644
 static QTAILQ_HEAD(, ObjectOption) object_opts = QTAILQ_HEAD_INITIALIZER(object_opts);
 static QTAILQ_HEAD(, DeviceOption) device_opts = QTAILQ_HEAD_INITIALIZER(device_opts);
 static int display_remote;
-@@ -2725,6 +2726,12 @@ void qmp_x_exit_preconfig(Error **errp)
+@@ -2712,6 +2713,12 @@ void qmp_x_exit_preconfig(Error **errp)
         RunState state = autostart ? RUN_STATE_RUNNING : runstate_get();
         load_snapshot(loadvm, NULL, false, NULL, &error_fatal);
         load_snapshot_resume(state);
@@ -892,7 +857,7 @@ index 2f855d83fb..39d451bb41 100644
     }
     if (replay_mode != REPLAY_MODE_NONE) {
         replay_vmstate_init();
-@@ -3262,6 +3269,9 @@ void qemu_init(int argc, char **argv)
+@@ -3259,6 +3266,9 @@ void qemu_init(int argc, char **argv)
             case QEMU_OPTION_loadvm:
                 loadvm = optarg;
                 break;
--- a/debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch
+++ b/debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch
@@ -13,16 +13,16 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 [FE: adapt to removal of QEMUFileOps]
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
- migration/qemu-file.c    | 48 +++++++++++++++++++++++++++-------------
+ migration/qemu-file.c    | 50 +++++++++++++++++++++++++++-------------
 migration/qemu-file.h    |  2 ++
- migration/savevm-async.c |  5 +++--
- 3 files changed, 38 insertions(+), 17 deletions(-)
+ migration/savevm-async.c |  5 ++--
+ 3 files changed, 39 insertions(+), 18 deletions(-)

 diff --git a/migration/qemu-file.c b/migration/qemu-file.c
-index b6d2f588bd..754dc0b3f7 100644
+index a10882d47f..19c1de0472 100644
 --- a/migration/qemu-file.c
 +++ b/migration/qemu-file.c
-@@ -34,8 +34,8 @@
+@@ -35,8 +35,8 @@
 #include "rdma.h"
 #include "io/channel-file.h"
 
@@ -33,7 +33,7 @@ index b6d2f588bd..754dc0b3f7 100644
 
 struct QEMUFile {
     QIOChannel *ioc;
-@@ -43,7 +43,8 @@ struct QEMUFile {
+@@ -44,7 +44,8 @@ struct QEMUFile {
 
     int buf_index;
     int buf_size; /* 0 when writing */
@@ -43,7 +43,7 @@ index b6d2f588bd..754dc0b3f7 100644
 
     DECLARE_BITMAP(may_free, MAX_IOV_SIZE);
     struct iovec iov[MAX_IOV_SIZE];
-@@ -100,7 +101,9 @@ int qemu_file_shutdown(QEMUFile *f)
+@@ -101,7 +102,9 @@ int qemu_file_shutdown(QEMUFile *f)
     return 0;
 }
 
@@ -54,7 +54,7 @@ index b6d2f588bd..754dc0b3f7 100644
 {
     QEMUFile *f;
 
-@@ -109,6 +112,8 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
+@@ -110,6 +113,8 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
     object_ref(ioc);
     f->ioc = ioc;
     f->is_writable = is_writable;
@@ -63,7 +63,7 @@ index b6d2f588bd..754dc0b3f7 100644
 
     return f;
 }
-@@ -119,17 +124,27 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
+@@ -120,17 +125,27 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
  */
 QEMUFile *qemu_file_get_return_path(QEMUFile *f)
 {
@@ -94,7 +94,7 @@ index b6d2f588bd..754dc0b3f7 100644
 }
 
 /*
-@@ -327,7 +342,7 @@ static ssize_t coroutine_mixed_fn qemu_fill_buffer(QEMUFile *f)
+@@ -328,7 +343,7 @@ static ssize_t coroutine_mixed_fn qemu_fill_buffer(QEMUFile *f)
     do {
         len = qio_channel_read(f->ioc,
                                (char *)f->buf + pending,
@@ -103,7 +103,7 @@ index b6d2f588bd..754dc0b3f7 100644
                                &local_error);
         if (len == QIO_CHANNEL_ERR_BLOCK) {
             if (qemu_in_coroutine()) {
-@@ -367,6 +382,9 @@ int qemu_fclose(QEMUFile *f)
+@@ -368,6 +383,9 @@ int qemu_fclose(QEMUFile *f)
         ret = ret2;
     }
     g_clear_pointer(&f->ioc, object_unref);
@@ -113,7 +113,7 @@ index b6d2f588bd..754dc0b3f7 100644
     error_free(f->last_error_obj);
     g_free(f);
     trace_qemu_file_fclose();
-@@ -415,7 +433,7 @@ static void add_buf_to_iovec(QEMUFile *f, size_t len)
+@@ -416,7 +434,7 @@ static void add_buf_to_iovec(QEMUFile *f, size_t len)
 {
     if (!add_to_iovec(f, f->buf + f->buf_index, len, false)) {
         f->buf_index += len;
@@ -122,7 +122,7 @@ index b6d2f588bd..754dc0b3f7 100644
             qemu_fflush(f);
         }
     }
-@@ -440,7 +458,7 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size)
+@@ -441,7 +459,7 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size)
     }
 
     while (size > 0) {
@@ -131,7 +131,7 @@ index b6d2f588bd..754dc0b3f7 100644
         if (l > size) {
             l = size;
         }
-@@ -586,8 +604,8 @@ size_t coroutine_mixed_fn qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t si
+@@ -587,8 +605,8 @@ size_t coroutine_mixed_fn qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t si
     size_t index;
 
     assert(!qemu_file_is_writable(f));
@@ -142,7 +142,7 @@ index b6d2f588bd..754dc0b3f7 100644
 
     /* The 1st byte to read from */
     index = f->buf_index + offset;
-@@ -637,7 +655,7 @@ size_t coroutine_mixed_fn qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size
+@@ -638,7 +656,7 @@ size_t coroutine_mixed_fn qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size
         size_t res;
         uint8_t *src;
 
@@ -151,7 +151,7 @@ index b6d2f588bd..754dc0b3f7 100644
         if (res == 0) {
             return done;
         }
-@@ -671,7 +689,7 @@ size_t coroutine_mixed_fn qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size
+@@ -672,7 +690,7 @@ size_t coroutine_mixed_fn qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size
  */
 size_t coroutine_mixed_fn qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size)
 {
@@ -160,7 +160,7 @@ index b6d2f588bd..754dc0b3f7 100644
         size_t res;
         uint8_t *src = NULL;
 
-@@ -696,7 +714,7 @@ int coroutine_mixed_fn qemu_peek_byte(QEMUFile *f, int offset)
+@@ -697,7 +715,7 @@ int coroutine_mixed_fn qemu_peek_byte(QEMUFile *f, int offset)
     int index = f->buf_index + offset;
 
     assert(!qemu_file_is_writable(f));
@@ -169,8 +169,17 @@ index b6d2f588bd..754dc0b3f7 100644
 
     if (index >= f->buf_size) {
         qemu_fill_buffer(f);
+@@ -811,7 +829,7 @@ static int qemu_compress_data(z_stream *stream, uint8_t *dest, size_t dest_len,
+ ssize_t qemu_put_compression_data(QEMUFile *f, z_stream *stream,
+                                   const uint8_t *p, size_t size)
+ {
+-    ssize_t blen = IO_BUF_SIZE - f->buf_index - sizeof(int32_t);
+    ssize_t blen = f->buf_allocated_size - f->buf_index - sizeof(int32_t);
+ 
+     if (blen < compressBound(size)) {
+         return -1;
 diff --git a/migration/qemu-file.h b/migration/qemu-file.h
-index 11c2120edd..edf3c5d147 100644
+index 32fd4a34fd..36a0cd8cc8 100644
 --- a/migration/qemu-file.h
 +++ b/migration/qemu-file.h
@@ -30,7 +30,9 @@
@@ -184,10 +193,10 @@ index 11c2120edd..edf3c5d147 100644
 
 /*
 diff --git a/migration/savevm-async.c b/migration/savevm-async.c
-index ee8ef316d0..1e79fce9ba 100644
+index 72cf6588c2..fb4e8ea689 100644
 --- a/migration/savevm-async.c
 +++ b/migration/savevm-async.c
-@@ -390,7 +390,7 @@ void qmp_savevm_start(const char *statefile, Error **errp)
+@@ -379,7 +379,7 @@ void qmp_savevm_start(const char *statefile, Error **errp)
 
     QIOChannel *ioc = QIO_CHANNEL(qio_channel_savevm_async_new(snap_state.target,
                                                                &snap_state.bs_pos));
@@ -195,9 +204,9 @@ index ee8ef316d0..1e79fce9ba 100644
 +    snap_state.file = qemu_file_new_output_sized(ioc, 4 * 1024 * 1024);
 
     if (!snap_state.file) {
-         error_setg(errp, "failed to open '%s'", statefile);
-@@ -534,7 +534,8 @@ int load_snapshot_from_blockdev(const char *filename, Error **errp)
-     bdrv_op_block_all(bs, blocker);
+         error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile);
+@@ -503,7 +503,8 @@ int load_snapshot_from_blockdev(const char *filename, Error **errp)
+     blk_op_block_all(be, blocker);
 
     /* restore the VM state */
 -    f = qemu_file_new_input(QIO_CHANNEL(qio_channel_savevm_async_new(be, &bs_pos)));
--- a/debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch
+++ b/debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch
@@ -15,7 +15,7 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 create mode 100644 block/zeroinit.c

 diff --git a/block/meson.build b/block/meson.build
-index f1262ec2ba..6a60b5d6b9 100644
+index e1f03fd773..b530e117b5 100644
 --- a/block/meson.build
 +++ b/block/meson.build
@@ -39,6 +39,7 @@ block_ss.add(files(
@@ -23,12 +23,12 @@ index f1262ec2ba..6a60b5d6b9 100644
   'throttle-groups.c',
   'write-threshold.c',
 +  'zeroinit.c',
- ), zstd, zlib)
+ ), zstd, zlib, gnutls)
 
 system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
 diff --git a/block/zeroinit.c b/block/zeroinit.c
 new file mode 100644
-index 0000000000..2b2b194ccf
+index 0000000000..7998c9332d
 --- /dev/null
 +++ b/block/zeroinit.c
@@ -0,0 +1,207 @@
@@ -212,7 +212,7 @@ index 0000000000..2b2b194ccf
 +    .instance_size                    = sizeof(BDRVZeroinitState),
 +
 +    .bdrv_parse_filename              = zeroinit_parse_filename,
-+    .bdrv_open                        = zeroinit_open,
+    .bdrv_file_open                   = zeroinit_open,
 +    .bdrv_close                       = zeroinit_close,
 +    .bdrv_co_getlength                = zeroinit_co_getlength,
 +    .bdrv_child_perm                  = bdrv_default_perms,
--- a/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch
+++ b/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch
@@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2 files changed, 11 insertions(+)

 diff --git a/qemu-options.hx b/qemu-options.hx
-index c05f411599..0732077a0e 100644
+index 511ab9415e..92e301d545 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
-@@ -1239,6 +1239,9 @@ legacy PC, they are not recommended for modern configurations.
+@@ -1237,6 +1237,9 @@ legacy PC, they are not recommended for modern configurations.
 
 ERST
 
@@ -28,10 +28,10 @@ index c05f411599..0732077a0e 100644
     "-fda/-fdb file  use 'file' as floppy disk 0/1 image\n", QEMU_ARCH_ALL)
 DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
 diff --git a/system/vl.c b/system/vl.c
-index 39d451bb41..e7cae51f13 100644
+index 2738ab7c91..20ebf2c920 100644
 --- a/system/vl.c
 +++ b/system/vl.c
-@@ -2762,6 +2762,7 @@ void qemu_init(int argc, char **argv)
+@@ -2748,6 +2748,7 @@ void qemu_init(int argc, char **argv)
     MachineClass *machine_class;
     bool userconfig = true;
     FILE *vmstate_dump_file = NULL;
@@ -39,7 +39,7 @@ index 39d451bb41..e7cae51f13 100644
 
     qemu_add_opts(&qemu_drive_opts);
     qemu_add_drive_opts(&qemu_legacy_drive_opts);
-@@ -3374,6 +3375,13 @@ void qemu_init(int argc, char **argv)
+@@ -3371,6 +3372,13 @@ void qemu_init(int argc, char **argv)
                 machine_parse_property_opt(qemu_find_opts("smp-opts"),
                                            "smp", optarg);
                 break;
--- a/debian/patches/pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch
+++ b/debian/patches/pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch
@@ -11,7 +11,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 9 insertions(+)

 diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
-index 62f3bbf203..89e0c7d995 100644
+index d8fc1e2815..789694b8b3 100644
 --- a/hw/intc/apic_common.c
 +++ b/hw/intc/apic_common.c
@@ -263,6 +263,15 @@ static void apic_reset_common(DeviceState *dev)
--- a/debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch
+++ b/debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch
@@ -13,10 +13,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2 files changed, 46 insertions(+), 20 deletions(-)

 diff --git a/block/file-posix.c b/block/file-posix.c
-index e2ea071315..4c3dc56c8e 100644
+index 43bc0bd520..60e98c87f1 100644
 --- a/block/file-posix.c
 +++ b/block/file-posix.c
-@@ -2884,6 +2884,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
+@@ -2876,6 +2876,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
     int fd;
     uint64_t perm, shared;
     int result = 0;
@@ -24,7 +24,7 @@ index e2ea071315..4c3dc56c8e 100644
 
     /* Validate options and set default values */
     assert(options->driver == BLOCKDEV_DRIVER_FILE);
-@@ -2924,19 +2925,22 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
+@@ -2916,19 +2917,22 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
     perm = BLK_PERM_WRITE | BLK_PERM_RESIZE;
     shared = BLK_PERM_ALL & ~BLK_PERM_RESIZE;
 
@@ -59,7 +59,7 @@ index e2ea071315..4c3dc56c8e 100644
     }
 
     /* Clear the file by truncating it to 0 */
-@@ -2990,13 +2994,15 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
+@@ -2982,13 +2986,15 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
     }
 
 out_unlock:
@@ -82,7 +82,7 @@ index e2ea071315..4c3dc56c8e 100644
     }
 
 out_close:
-@@ -3020,6 +3026,7 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
+@@ -3012,6 +3018,7 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
     PreallocMode prealloc;
     char *buf = NULL;
     Error *local_err = NULL;
@@ -90,7 +90,7 @@ index e2ea071315..4c3dc56c8e 100644
 
     /* Skip file: protocol prefix */
     strstart(filename, "file:", &filename);
-@@ -3042,6 +3049,18 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
+@@ -3034,6 +3041,18 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
         return -EINVAL;
     }
 
@@ -109,7 +109,7 @@ index e2ea071315..4c3dc56c8e 100644
     options = (BlockdevCreateOptions) {
         .driver     = BLOCKDEV_DRIVER_FILE,
         .u.file     = {
-@@ -3053,6 +3072,8 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
+@@ -3045,6 +3064,8 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
             .nocow              = nocow,
             .has_extent_size_hint = has_extent_size_hint,
             .extent_size_hint   = extent_size_hint,
@@ -119,10 +119,10 @@ index e2ea071315..4c3dc56c8e 100644
     };
     return raw_co_create(&options, errp);
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 48ba32049f..321d1fd0e1 100644
+index 905da8be72..3db587a6e4 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -4974,6 +4974,10 @@
+@@ -4956,6 +4956,10 @@
 # @extent-size-hint: Extent size hint to add to the image file; 0 for
 #     not adding an extent size hint (default: 1 MB, since 5.1)
 #
@@ -133,7 +133,7 @@ index 48ba32049f..321d1fd0e1 100644
 # Since: 2.12
 ##
 { 'struct': 'BlockdevCreateOptionsFile',
-@@ -4981,7 +4985,8 @@
+@@ -4963,7 +4967,8 @@
             'size':                 'size',
             '*preallocation':       'PreallocMode',
             '*nocow':               'bool',
--- a/debian/patches/pve/0023-PVE-monitor-disable-oob-capability.patch
+++ b/debian/patches/pve/0023-PVE-monitor-disable-oob-capability.patch
@@ -18,10 +18,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 1 insertion(+), 2 deletions(-)

 diff --git a/monitor/qmp.c b/monitor/qmp.c
-index eb181d5979..20fc0d20a6 100644
+index 589c9524f8..2505dd658a 100644
 --- a/monitor/qmp.c
 +++ b/monitor/qmp.c
-@@ -534,8 +534,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
+@@ -536,8 +536,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
     qemu_chr_fe_set_echo(&mon->common.chr, true);
 
     /* Note: we run QMP monitor in I/O thread when @chr supports that */
--- a/debian/patches/pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch
+++ b/debian/patches/pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch
@@ -26,10 +26,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/hw/core/machine.c b/hw/core/machine.c
-index f29fe95964..2c327fc36a 100644
+index 4273de16a0..83f1fc0293 100644
 --- a/hw/core/machine.c
 +++ b/hw/core/machine.c
-@@ -180,7 +180,8 @@ GlobalProperty hw_compat_4_0[] = {
+@@ -162,7 +162,8 @@ GlobalProperty hw_compat_4_0[] = {
     { "virtio-vga",     "edid", "false" },
     { "virtio-gpu-device", "edid", "false" },
     { "virtio-device", "use-started", "false" },
--- a/debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch
+++ b/debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch
@@ -16,15 +16,15 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
 hw/core/machine-qmp-cmds.c |  5 +++++
 include/hw/boards.h        |  2 ++
- qapi/machine.json          |  3 +++
- system/vl.c                | 24 ++++++++++++++++++++++++
- 4 files changed, 34 insertions(+)
+ qapi/machine.json          |  4 +++-
+ system/vl.c                | 25 +++++++++++++++++++++++++
+ 4 files changed, 35 insertions(+), 1 deletion(-)

 diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
-index 52a6d74820..362128842d 100644
+index 314351cdff..628a3537c5 100644
 --- a/hw/core/machine-qmp-cmds.c
 +++ b/hw/core/machine-qmp-cmds.c
-@@ -94,6 +94,11 @@ MachineInfoList *qmp_query_machines(bool has_compat_props, bool compat_props,
+@@ -94,6 +94,11 @@ MachineInfoList *qmp_query_machines(Error **errp)
         if (strcmp(mc->name, MACHINE_GET_CLASS(current_machine)->name) == 0) {
             info->has_is_current = true;
             info->is_current = true;
@@ -37,64 +37,65 @@ index 52a6d74820..362128842d 100644
 
         if (mc->default_cpu_type) {
 diff --git a/include/hw/boards.h b/include/hw/boards.h
-index 36fbb9b59d..d1741ea121 100644
+index 8b8f6d5c00..dd6d0a1447 100644
 --- a/include/hw/boards.h
 +++ b/include/hw/boards.h
-@@ -268,6 +268,8 @@ struct MachineClass {
+@@ -246,6 +246,8 @@ struct MachineClass {
     const char *desc;
     const char *deprecation_reason;
 
 +    const char *pve_version;
 +
     void (*init)(MachineState *state);
-     void (*reset)(MachineState *state, ResetType type);
+     void (*reset)(MachineState *state, ShutdownCause reason);
     void (*wakeup)(MachineState *state);
 diff --git a/qapi/machine.json b/qapi/machine.json
-index 16366b774a..12cfd3f260 100644
+index a024d5b05d..1d69bffaa0 100644
 --- a/qapi/machine.json
 +++ b/qapi/machine.json
-@@ -189,6 +189,8 @@
+@@ -168,6 +168,8 @@
 #
 # @acpi: machine type supports ACPI (since 8.0)
 #
 +# @pve-version: custom PVE version suffix specified as 'machine+pveN'
 +#
- # @compat-props: The machine type's compatibility properties.  Only
- #     present when query-machines argument @compat-props is true.
- #     (since 9.1)
-@@ -205,6 +207,7 @@
+ # Since: 1.2
+ ##
+ { 'struct': 'MachineInfo',
+@@ -175,7 +177,7 @@
+             '*is-default': 'bool', '*is-current': 'bool', 'cpu-max': 'int',
             'hotpluggable-cpus': 'bool',  'numa-mem-supported': 'bool',
             'deprecated': 'bool', '*default-cpu-type': 'str',
-             '*default-ram-id': 'str', 'acpi': 'bool',
-+            '*pve-version': 'str',
-             '*compat-props': { 'type': ['CompatProperty'],
-                                'features': ['unstable'] } } }
+-            '*default-ram-id': 'str', 'acpi': 'bool' } }
+            '*default-ram-id': 'str', 'acpi': 'bool', '*pve-version': 'str' } }
 
+ ##
+ # @query-machines:
 diff --git a/system/vl.c b/system/vl.c
-index e7cae51f13..3f4916ac5a 100644
+index 20ebf2c920..4d39e32097 100644
 --- a/system/vl.c
 +++ b/system/vl.c
-@@ -1675,6 +1675,7 @@ static MachineClass *select_machine(QDict *qdict, Error **errp)
+@@ -1659,6 +1659,7 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
+ static MachineClass *select_machine(QDict *qdict, Error **errp)
 {
-     ERRP_GUARD();
     const char *machine_type = qdict_get_try_str(qdict, "type");
 +    const char *pvever = qdict_get_try_str(qdict, "pvever");
-     g_autoptr(GSList) machines = object_class_get_list(TYPE_MACHINE, false);
-     MachineClass *machine_class = NULL;
+     GSList *machines = object_class_get_list(TYPE_MACHINE, false);
+     MachineClass *machine_class;
+     Error *local_err = NULL;
+@@ -1676,6 +1677,11 @@ static MachineClass *select_machine(QDict *qdict, Error **errp)
+         }
+     }
 
-@@ -1694,7 +1695,11 @@ static MachineClass *select_machine(QDict *qdict, Error **errp)
-     if (!machine_class) {
-         error_append_hint(errp,
-                           "Use -machine help to list supported machines\n");
-+    } else {
+    if (machine_class) {
 +        machine_class->pve_version = g_strdup(pvever);
 +        qdict_del(qdict, "pvever");
-     }
+    }
 +
-     return machine_class;
- }
- 
-@@ -3316,12 +3321,31 @@ void qemu_init(int argc, char **argv)
+     g_slist_free(machines);
+     if (local_err) {
+         error_append_hint(&local_err, "Use -machine help to list supported machines\n");
+@@ -3313,12 +3319,31 @@ void qemu_init(int argc, char **argv)
             case QEMU_OPTION_machine:
                 {
                     bool help;
--- a/debian/patches/pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch
+++ b/debian/patches/pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch
@@ -25,7 +25,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 4 insertions(+), 4 deletions(-)

 diff --git a/block/backup.c b/block/backup.c
-index a1292c01ec..2e38b30d67 100644
+index 3dd2e229d2..eba5b11493 100644
 --- a/block/backup.c
 +++ b/block/backup.c
@@ -237,8 +237,8 @@ static void backup_init_bcs_bitmap(BackupBlockJob *job)
--- a/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch
+++ b/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch
@@ -10,29 +10,28 @@ skip reads.

 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 [FE: improvements during create
-     allow partial restore
-     allow specifying disk formats for create operation]
+     allow partial restore]
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
 block/meson.build |   2 +
 meson.build       |   5 +
- vma-reader.c      | 867 ++++++++++++++++++++++++++++++++++++++++++
- vma-writer.c      | 816 ++++++++++++++++++++++++++++++++++++++++
- vma.c             | 941 ++++++++++++++++++++++++++++++++++++++++++++++
+ vma-reader.c      | 870 ++++++++++++++++++++++++++++++++++++++++++++
+ vma-writer.c      | 817 +++++++++++++++++++++++++++++++++++++++++
+ vma.c             | 901 ++++++++++++++++++++++++++++++++++++++++++++++
 vma.h             | 150 ++++++++
- 6 files changed, 2781 insertions(+)
+ 6 files changed, 2745 insertions(+)
 create mode 100644 vma-reader.c
 create mode 100644 vma-writer.c
 create mode 100644 vma.c
 create mode 100644 vma.h

 diff --git a/block/meson.build b/block/meson.build
-index 6a60b5d6b9..652c8cbdb7 100644
+index b530e117b5..b245daa98e 100644
 --- a/block/meson.build
 +++ b/block/meson.build
@@ -42,6 +42,8 @@ block_ss.add(files(
   'zeroinit.c',
- ), zstd, zlib)
+ ), zstd, zlib, gnutls)
 
 +block_ss.add(files('../vma-writer.c'), libuuid)
 +
@@ -40,10 +39,10 @@ index 6a60b5d6b9..652c8cbdb7 100644
 system_ss.add(files('block-ram-registrar.c'))
 
 diff --git a/meson.build b/meson.build
-index 147097c652..b9b673c271 100644
+index 91a0aa64c6..620cc594b2 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2129,6 +2129,8 @@ endif
+@@ -1922,6 +1922,8 @@ endif
 
 has_gettid = cc.has_function('gettid')
 
@@ -52,22 +51,22 @@ index 147097c652..b9b673c271 100644
 # libselinux
 selinux = dependency('libselinux',
                      required: get_option('selinux'),
-@@ -4344,6 +4346,9 @@ if have_tools
-                dependencies: [blockdev, qemuutil, selinux],
+@@ -4023,6 +4025,9 @@ if have_tools
+                dependencies: [blockdev, qemuutil, gnutls, selinux],
                install: true)
 
 +  vma = executable('vma', files('vma.c', 'vma-reader.c') + genh,
-+                   dependencies: [authz, block, crypto, io, qemuutil, qom], install: true)
+                   dependencies: [authz, block, crypto, io, qom], install: true)
 +
   subdir('storage-daemon')
 
   foreach exe: [ 'qemu-img', 'qemu-io', 'qemu-nbd', 'qemu-storage-daemon']
 diff --git a/vma-reader.c b/vma-reader.c
 new file mode 100644
-index 0000000000..bb65ad313c
+index 0000000000..d0b6721812
 --- /dev/null
 +++ b/vma-reader.c
-@@ -0,0 +1,867 @@
+@@ -0,0 +1,870 @@
 +/*
 + * VMA: Virtual Machine Archive
 + *
@@ -382,6 +381,7 @@ index 0000000000..bb65ad313c
 +    }
 +
 +
+    int count = 0;
 +    for (i = 1; i < 256; i++) {
 +        VmaDeviceInfoHeader *dih = &h->dev_info[i];
 +        uint32_t devname_ptr = GUINT32_FROM_BE(dih->devname_ptr);
@@ -389,6 +389,7 @@ index 0000000000..bb65ad313c
 +        const char *devname =  get_header_str(vmar, devname_ptr);
 +
 +        if (size && devname) {
+            count++;
 +            vmar->devinfo[i].size = size;
 +            vmar->devinfo[i].devname = devname;
 +
@@ -883,7 +884,8 @@ index 0000000000..bb65ad313c
 +
 +            int64_t cluster_num, end;
 +
-+            end = DIV_ROUND_UP(vmar->devinfo[i].size, VMA_CLUSTER_SIZE);
+            end = (vmar->devinfo[i].size + VMA_CLUSTER_SIZE - 1) /
+                VMA_CLUSTER_SIZE;
 +
 +            for (cluster_num = 0; cluster_num < end; cluster_num++) {
 +                if (!vma_reader_get_bitmap(rstate, cluster_num)) {
@@ -937,10 +939,10 @@ index 0000000000..bb65ad313c
 +
 diff --git a/vma-writer.c b/vma-writer.c
 new file mode 100644
-index 0000000000..3f489092df
+index 0000000000..a466652a5d
 --- /dev/null
 +++ b/vma-writer.c
-@@ -0,0 +1,816 @@
+@@ -0,0 +1,817 @@
 +/*
 + * VMA: Virtual Machine Archive
 + *
@@ -1134,7 +1136,8 @@ index 0000000000..3f489092df
 +    vmaw->stream_info[n].devname = g_strdup(devname);
 +    vmaw->stream_info[n].size = size;
 +
-+    vmaw->stream_info[n].cluster_count = DIV_ROUND_UP(size, VMA_CLUSTER_SIZE);
+    vmaw->stream_info[n].cluster_count = (size + VMA_CLUSTER_SIZE - 1) /
+        VMA_CLUSTER_SIZE;
 +
 +    vmaw->stream_count = n;
 +
@@ -1759,10 +1762,10 @@ index 0000000000..3f489092df
 +}
 diff --git a/vma.c b/vma.c
 new file mode 100644
-index 0000000000..8d4b4be414
+index 0000000000..bb715e9061
 --- /dev/null
 +++ b/vma.c
-@@ -0,0 +1,941 @@
+@@ -0,0 +1,901 @@
 +/*
 + * VMA: Virtual Machine Archive
 + *
@@ -1794,8 +1797,8 @@ index 0000000000..8d4b4be414
 +        "usage: vma command [command options]\n"
 +        "\n"
 +        "vma list <filename>\n"
-+        "vma config <filename> [-c <config>]\n"
-+        "vma create <filename> [-c <config>] [-d format=<format>:<device name>=<path> [-d ...]]\n"
+        "vma config <filename> [-c config]\n"
+        "vma create <filename> [-c config] pathname ...\n"
 +        "vma extract <filename> [-d <drive-list>] [-r <fifo>] <targetdir>\n"
 +        "vma verify <filename> [-v]\n"
 +        ;
@@ -2386,14 +2389,12 @@ index 0000000000..8d4b4be414
 +{
 +    int c;
 +    int verbose = 0;
-+    bool expect_format = true;
 +    const char *archivename;
 +    GList *backup_coroutines = NULL;
 +    GList *config_files = NULL;
-+    GList *disk_infos = NULL;
 +
 +    for (;;) {
-+        c = getopt(argc, argv, "hvc:d:");
+        c = getopt(argc, argv, "hvc:");
 +        if (c == -1) {
 +            break;
 +        }
@@ -2405,9 +2406,6 @@ index 0000000000..8d4b4be414
 +        case 'c':
 +            config_files = g_list_append(config_files, optarg);
 +            break;
-+        case 'd':
-+            disk_infos = g_list_append(disk_infos, optarg);
-+            break;
 +        case 'v':
 +            verbose = 1;
 +            break;
@@ -2453,48 +2451,16 @@ index 0000000000..8d4b4be414
 +        l = g_list_next(l);
 +    }
 +
-+    /*
-+     * Don't allow mixing new and old way to specifiy disks.
-+     * TODO PVE 9 drop old way and always require format.
-+     */
-+    if (optind < argc && g_list_first(disk_infos)) {
-+        unlink(archivename);
-+        g_error("Unexpected extra argument - specify all devices via '-d'");
-+    }
-+
-+    while (optind < argc) {
-+        expect_format = false;
-+        disk_infos = g_list_append(disk_infos, argv[optind++]);
-+    }
-+
 +    int devcount = 0;
-+    GList *disk_l = disk_infos;
-+    while (disk_l && disk_l->data) {
-+        char *disk_info = disk_l->data;
-+        const char *path = NULL;
+    while (optind < argc) {
+        const char *path = argv[optind++];
 +        char *devname = NULL;
-+        char *format = NULL;
-+        QDict *options = qdict_new();
-+
-+        if (try_parse_option(&disk_info, "format", &format, disk_info)) {
-+            qdict_put_str(options, "driver", format);
-+        } else {
-+            if (expect_format) {
-+                unlink(archivename);
-+                g_error("No format specified for device: '%s'", disk_info);
-+            } else {
-+                g_warning("Specifying a device without a format is deprecated"
-+                          " - use '-d format=<format>:%s'",
-+                          disk_info);
-+            }
-+        }
-+
-+        path = extract_devname(disk_info, &devname, devcount++);
+        path = extract_devname(path, &devname, devcount++);
 +
 +        Error *errp = NULL;
 +        BlockBackend *target;
 +
-+        target = blk_new_open(path, NULL, options, 0, &errp);
+        target = blk_new_open(path, NULL, NULL, 0, &errp);
 +        if (!target) {
 +            unlink(archivename);
 +            g_error("bdrv_open '%s' failed - %s", path, error_get_pretty(errp));
@@ -2516,8 +2482,6 @@ index 0000000000..8d4b4be414
 +        // Don't enter coroutine yet, because it might write the header before
 +        // all streams can be registered.
 +        backup_coroutines = g_list_append(backup_coroutines, co);
-+
-+        disk_l = g_list_next(disk_l);
 +    }
 +
 +    VmaStatus vmastat;
@@ -2599,7 +2563,6 @@ index 0000000000..8d4b4be414
 +
 +    g_list_free(backup_coroutines);
 +    g_list_free(config_files);
-+    g_list_free(disk_infos);
 +    vma_writer_destroy(vmaw);
 +    return 0;
 +}
--- a/debian/patches/pve/0028-PVE-Backup-add-backup-dump-block-driver.patch
+++ b/debian/patches/pve/0028-PVE-Backup-add-backup-dump-block-driver.patch
@@ -199,7 +199,7 @@ index 0000000000..e46abf1070
 +    return bs;
 +}
 diff --git a/block/backup.c b/block/backup.c
-index 2e38b30d67..fe69723ada 100644
+index eba5b11493..1963e47ab9 100644
 --- a/block/backup.c
 +++ b/block/backup.c
@@ -29,28 +29,6 @@
@@ -247,7 +247,7 @@ index 2e38b30d67..fe69723ada 100644
     if (perf->max_chunk && perf->max_chunk < cluster_size) {
         error_setg(errp, "Required max-chunk (%" PRIi64 ") is less than backup "
 diff --git a/block/meson.build b/block/meson.build
-index 652c8cbdb7..e1cf5a2e65 100644
+index b245daa98e..e99914eaa4 100644
 --- a/block/meson.build
 +++ b/block/meson.build
@@ -4,6 +4,7 @@ block_ss.add(files(
@@ -259,7 +259,7 @@ index 652c8cbdb7..e1cf5a2e65 100644
   'blklogwrites.c',
   'blkverify.c',
 diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
-index ebb4e56a50..e717a74e5f 100644
+index 761276127e..b3e6697613 100644
 --- a/include/block/block_int-common.h
 +++ b/include/block/block_int-common.h
@@ -26,6 +26,7 @@
--- a/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch
+++ b/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch
@@ -94,21 +94,21 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 monitor/hmp-cmds.c             |   72 +++
 proxmox-backup-client.c        |  146 +++++
 proxmox-backup-client.h        |   60 ++
- pve-backup.c                   | 1090 ++++++++++++++++++++++++++++++++
+ pve-backup.c                   | 1092 ++++++++++++++++++++++++++++++++
 qapi/block-core.json           |  233 +++++++
 qapi/common.json               |   14 +
 qapi/machine.json              |   16 +-
- 14 files changed, 1709 insertions(+), 14 deletions(-)
+ 14 files changed, 1711 insertions(+), 14 deletions(-)
 create mode 100644 proxmox-backup-client.c
 create mode 100644 proxmox-backup-client.h
 create mode 100644 pve-backup.c

 diff --git a/block/meson.build b/block/meson.build
-index e1cf5a2e65..2367e1ac1b 100644
+index e99914eaa4..6bba803f94 100644
 --- a/block/meson.build
 +++ b/block/meson.build
@@ -44,6 +44,11 @@ block_ss.add(files(
- ), zstd, zlib)
+ ), zstd, zlib, gnutls)
 
 block_ss.add(files('../vma-writer.c'), libuuid)
 +block_ss.add(files(
@@ -120,10 +120,10 @@ index e1cf5a2e65..2367e1ac1b 100644
 system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
 system_ss.add(files('block-ram-registrar.c'))
 diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
-index bdf2eb50b6..439a7a14c8 100644
+index d954bec6f1..5000c084c5 100644
 --- a/block/monitor/block-hmp-cmds.c
 +++ b/block/monitor/block-hmp-cmds.c
-@@ -1009,3 +1009,42 @@ void hmp_change_medium(Monitor *mon, const char *device, const char *target,
+@@ -1008,3 +1008,42 @@ void hmp_change_medium(Monitor *mon, const char *device, const char *target,
     qmp_blockdev_change_medium(device, NULL, target, arg, true, force,
                                !!read_only, read_only_mode, errp);
 }
@@ -167,7 +167,7 @@ index bdf2eb50b6..439a7a14c8 100644
 +    hmp_handle_error(mon, error);
 +}
 diff --git a/blockdev.c b/blockdev.c
-index 79d47b1920..3f67eb413d 100644
+index ed8198f351..1054a69279 100644
 --- a/blockdev.c
 +++ b/blockdev.c
@@ -37,6 +37,7 @@
@@ -179,10 +179,10 @@ index 79d47b1920..3f67eb413d 100644
 #include "monitor/monitor.h"
 #include "qemu/error-report.h"
 diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
-index d1a7b99add..af588145ff 100644
+index d5ab880492..6c97248d1b 100644
 --- a/hmp-commands-info.hx
 +++ b/hmp-commands-info.hx
-@@ -458,6 +458,20 @@ SRST
+@@ -471,6 +471,20 @@ SRST
     Show the current VM UUID.
 ERST
 
@@ -204,7 +204,7 @@ index d1a7b99add..af588145ff 100644
     {
         .name       = "usernet",
 diff --git a/hmp-commands.hx b/hmp-commands.hx
-index 0c7c6f2c16..bf8315f226 100644
+index 7506de251c..d5f9c28194 100644
 --- a/hmp-commands.hx
 +++ b/hmp-commands.hx
@@ -101,6 +101,35 @@ ERST
@@ -244,7 +244,7 @@ index 0c7c6f2c16..bf8315f226 100644
 
     {
 diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
-index 2596cc2426..9dda91d65a 100644
+index 7a7def7530..cba7afe70c 100644
 --- a/include/monitor/hmp.h
 +++ b/include/monitor/hmp.h
@@ -32,6 +32,7 @@ void hmp_info_savevm(Monitor *mon, const QDict *qdict);
@@ -255,7 +255,7 @@ index 2596cc2426..9dda91d65a 100644
 void hmp_info_cpus(Monitor *mon, const QDict *qdict);
 void hmp_info_vnc(Monitor *mon, const QDict *qdict);
 void hmp_info_spice(Monitor *mon, const QDict *qdict);
-@@ -82,6 +83,8 @@ void hmp_change_vnc(Monitor *mon, const char *device, const char *target,
+@@ -84,6 +85,8 @@ void hmp_change_vnc(Monitor *mon, const char *device, const char *target,
 void hmp_change_medium(Monitor *mon, const char *device, const char *target,
                        const char *arg, const char *read_only, bool force,
                        Error **errp);
@@ -265,10 +265,10 @@ index 2596cc2426..9dda91d65a 100644
 void hmp_device_add(Monitor *mon, const QDict *qdict);
 void hmp_device_del(Monitor *mon, const QDict *qdict);
 diff --git a/meson.build b/meson.build
-index b9b673c271..f6fb9b4fd8 100644
+index 620cc594b2..d16b97cf3c 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2130,6 +2130,7 @@ endif
+@@ -1923,6 +1923,7 @@ endif
 has_gettid = cc.has_function('gettid')
 
 libuuid = cc.find_library('uuid', required: true)
@@ -277,18 +277,18 @@ index b9b673c271..f6fb9b4fd8 100644
 # libselinux
 selinux = dependency('libselinux',
 diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
-index 874084565f..bedeb81f8c 100644
+index ef4634e5c1..6e25279f42 100644
 --- a/monitor/hmp-cmds.c
 +++ b/monitor/hmp-cmds.c
-@@ -22,6 +22,7 @@
+@@ -21,6 +21,7 @@
 #include "qemu/help_option.h"
 #include "monitor/monitor-internal.h"
 #include "qapi/error.h"
 +#include "qapi/qapi-commands-block-core.h"
 #include "qapi/qapi-commands-control.h"
- #include "qapi/qapi-commands-machine.h"
 #include "qapi/qapi-commands-migration.h"
-@@ -119,6 +120,77 @@ void hmp_sync_profile(Monitor *mon, const QDict *qdict)
+ #include "qapi/qapi-commands-misc.h"
+@@ -144,6 +145,77 @@ void hmp_sync_profile(Monitor *mon, const QDict *qdict)
     }
 }
 
@@ -586,10 +586,10 @@ index 0000000000..8cbf645b2c
 +#endif /* PROXMOX_BACKUP_CLIENT_H */
 diff --git a/pve-backup.c b/pve-backup.c
 new file mode 100644
-index 0000000000..fea0152de0
+index 0000000000..c755bf302b
 --- /dev/null
 +++ b/pve-backup.c
-@@ -0,0 +1,1090 @@
+@@ -0,0 +1,1092 @@
 +#include "proxmox-backup-client.h"
 +#include "vma.h"
 +
@@ -1194,7 +1194,7 @@ index 0000000000..fea0152de0
 +            }
 +            BlockDriverState *bs = blk_bs(blk);
 +            if (!bdrv_co_is_inserted(bs)) {
-+                error_setg(errp, "Device '%s' has no medium", *d);
+                error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, *d);
 +                goto err;
 +            }
 +            PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
@@ -1440,7 +1440,9 @@ index 0000000000..fea0152de0
 +    } else if (format == BACKUP_FORMAT_VMA) {
 +        vmaw = vma_writer_create(backup_file, uuid, &local_err);
 +        if (!vmaw) {
-+            error_propagate(errp, local_err);
+            if (local_err) {
+                error_propagate(errp, local_err);
+            }
 +            goto err_mutex;
 +        }
 +
@@ -1681,7 +1683,7 @@ index 0000000000..fea0152de0
 +    return ret;
 +}
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 321d1fd0e1..68caf30084 100644
+index 3db587a6e4..d05fffce1d 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
@@ -851,6 +851,239 @@
@@ -1823,7 +1825,7 @@ index 321d1fd0e1..68caf30084 100644
 +#
 +# Cancel the current executing backup process.
 +#
-+# .. note:: This command succeeds even if there is no backup process running.
+# Notes: This command succeeds even if there is no backup process running.
 +#
 +##
 +{ 'command': 'backup-cancel', 'coroutine': true }
@@ -1925,10 +1927,10 @@ index 321d1fd0e1..68caf30084 100644
 # @BlockDeviceTimedStats:
 #
 diff --git a/qapi/common.json b/qapi/common.json
-index 6ffc7a3789..9c6c671ece 100644
+index 7558ce5430..6e3d800373 100644
 --- a/qapi/common.json
 +++ b/qapi/common.json
-@@ -212,3 +212,17 @@
+@@ -200,3 +200,17 @@
 ##
 { 'struct': 'HumanReadableText',
   'data': { 'human-readable-text': 'str' } }
@@ -1942,12 +1944,12 @@ index 6ffc7a3789..9c6c671ece 100644
 +#
 +# Since: 0.14.0
 +#
-+# .. note:: If no UUID was specified for the guest, a null UUID is
+# Notes: If no UUID was specified for the guest, a null UUID is
 +#     returned.
 +##
 +{ 'struct': 'UuidInfo', 'data': {'UUID': 'str'} }
 diff --git a/qapi/machine.json b/qapi/machine.json
-index 12cfd3f260..a8abdb42a3 100644
+index 1d69bffaa0..731d8d2f60 100644
 --- a/qapi/machine.json
 +++ b/qapi/machine.json
@@ -4,6 +4,8 @@
@@ -1959,7 +1961,7 @@ index 12cfd3f260..a8abdb42a3 100644
 ##
 # = Machines
 ##
-@@ -302,20 +304,6 @@
+@@ -237,20 +239,6 @@
 ##
 { 'command': 'query-target', 'returns': 'TargetInfo' }
 
@@ -1972,8 +1974,8 @@ index 12cfd3f260..a8abdb42a3 100644
 -#
 -# Since: 0.14
 -#
-# .. note:: If no UUID was specified for the guest, the nil UUID (all
-#    zeroes) is returned.
+-# Notes: If no UUID was specified for the guest, a null UUID is
+-#     returned.
 -##
 -{ 'struct': 'UuidInfo', 'data': {'UUID': 'str'} }
 -
--- a/debian/patches/pve/0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch
+++ b/debian/patches/pve/0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch
@@ -14,15 +14,15 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
 create mode 100644 pbs-restore.c

 diff --git a/meson.build b/meson.build
-index f6fb9b4fd8..f666d0f028 100644
+index d16b97cf3c..6de51c34cb 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -4350,6 +4350,10 @@ if have_tools
+@@ -4029,6 +4029,10 @@ if have_tools
   vma = executable('vma', files('vma.c', 'vma-reader.c') + genh,
-                    dependencies: [authz, block, crypto, io, qemuutil, qom], install: true)
+                    dependencies: [authz, block, crypto, io, qom], install: true)
 
 +  pbs_restore = executable('pbs-restore', files('pbs-restore.c') + genh,
-+                  dependencies: [authz, block, crypto, io, qemuutil, qom,
+                  dependencies: [authz, block, crypto, io, qom,
 +                    libproxmox_backup_qemu], install: true)
 +
   subdir('storage-daemon')
--- a/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch
+++ b/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch
@@ -15,15 +15,15 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
 block/meson.build    |   2 +
- block/pbs.c          | 306 +++++++++++++++++++++++++++++++++++++++++++
+ block/pbs.c          | 313 +++++++++++++++++++++++++++++++++++++++++++
 meson.build          |   2 +-
 qapi/block-core.json |  29 ++++
 qapi/pragma.json     |   1 +
- 5 files changed, 339 insertions(+), 1 deletion(-)
+ 5 files changed, 346 insertions(+), 1 deletion(-)
 create mode 100644 block/pbs.c

 diff --git a/block/meson.build b/block/meson.build
-index 2367e1ac1b..e178047ec9 100644
+index 6bba803f94..1945e04eeb 100644
 --- a/block/meson.build
 +++ b/block/meson.build
@@ -49,6 +49,8 @@ block_ss.add(files(
@@ -37,10 +37,10 @@ index 2367e1ac1b..e178047ec9 100644
 system_ss.add(files('block-ram-registrar.c'))
 diff --git a/block/pbs.c b/block/pbs.c
 new file mode 100644
-index 0000000000..2d5e28ce8f
+index 0000000000..aee66c2e93
 --- /dev/null
 +++ b/block/pbs.c
-@@ -0,0 +1,306 @@
+@@ -0,0 +1,313 @@
 +/*
 + * Proxmox Backup Server read-only block driver
 + */
@@ -223,6 +223,12 @@ index 0000000000..2d5e28ce8f
 +    return 0;
 +}
 +
+static int pbs_file_open(BlockDriverState *bs, QDict *options, int flags,
+                         Error **errp)
+{
+    return pbs_open(bs, options, flags, errp);
+}
+
 +static void pbs_close(BlockDriverState *bs) {
 +    BDRVPBSState *s = bs->opaque;
 +    g_free(s->repository);
@@ -330,6 +336,7 @@ index 0000000000..2d5e28ce8f
 +
 +    .bdrv_parse_filename    = pbs_parse_filename,
 +
+    .bdrv_file_open         = pbs_file_open,
 +    .bdrv_open              = pbs_open,
 +    .bdrv_close             = pbs_close,
 +    .bdrv_co_getlength      = pbs_co_getlength,
@@ -348,23 +355,23 @@ index 0000000000..2d5e28ce8f
 +
 +block_init(bdrv_pbs_init);
 diff --git a/meson.build b/meson.build
-index f666d0f028..4c85736ec3 100644
+index 6de51c34cb..3bc039f60f 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -4815,7 +4815,7 @@ summary_info += {'Query Processing Library support': qpl}
- summary_info += {'UADK Library support': uadk}
- summary_info += {'qatzip support':    qatzip}
+@@ -4477,7 +4477,7 @@ summary_info += {'bzip2 support':     libbzip2}
+ summary_info += {'lzfse support':     liblzfse}
+ summary_info += {'zstd support':      zstd}
 summary_info += {'NUMA host support': numa}
 -summary_info += {'capstone':          capstone}
 +summary_info += {'PBS bdrv support':  config_host.has_key('CONFIG_PBS_BDRV')}
 summary_info += {'libpmem support':   libpmem}
 summary_info += {'libdaxctl support': libdaxctl}
- summary_info += {'libcbor support':   libcbor}
+ summary_info += {'libudev':           libudev}
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 68caf30084..d45e8975a7 100644
+index d05fffce1d..e7cf3d94f3 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -3466,6 +3466,7 @@
+@@ -3457,6 +3457,7 @@
             'parallels', 'preallocate', 'qcow', 'qcow2', 'qed', 'quorum',
             'raw', 'rbd',
             { 'name': 'replication', 'if': 'CONFIG_REPLICATION' },
@@ -372,7 +379,7 @@ index 68caf30084..d45e8975a7 100644
             'ssh', 'throttle', 'vdi', 'vhdx',
             { 'name': 'virtio-blk-vfio-pci', 'if': 'CONFIG_BLKIO' },
             { 'name': 'virtio-blk-vhost-user', 'if': 'CONFIG_BLKIO' },
-@@ -3552,6 +3553,33 @@
+@@ -3543,6 +3544,33 @@
 { 'struct': 'BlockdevOptionsNull',
   'data': { '*size': 'int', '*latency-ns': 'uint64', '*read-zeroes': 'bool' } }
 
@@ -406,7 +413,7 @@ index 68caf30084..d45e8975a7 100644
 ##
 # @BlockdevOptionsNVMe:
 #
-@@ -4993,6 +5021,7 @@
+@@ -4977,6 +5005,7 @@
       'nfs':        'BlockdevOptionsNfs',
       'null-aio':   'BlockdevOptionsNull',
       'null-co':    'BlockdevOptionsNull',
@@ -415,10 +422,10 @@ index 68caf30084..d45e8975a7 100644
       'nvme-io_uring': { 'type': 'BlockdevOptionsNvmeIoUring',
                          'if': 'CONFIG_BLKIO' },
 diff --git a/qapi/pragma.json b/qapi/pragma.json
-index 6aaa9cb975..e9c595c4ba 100644
+index be8fa304c5..7ff46bd128 100644
 --- a/qapi/pragma.json
 +++ b/qapi/pragma.json
-@@ -91,6 +91,7 @@
+@@ -100,6 +100,7 @@
         'BlockInfo',                # query-block
         'BlockdevAioOptions',       # blockdev-add, -blockdev
         'BlockdevDriver',           # blockdev-add, query-blockstats, ...
--- a/debian/patches/pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch
+++ b/debian/patches/pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch
@@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2 files changed, 7 insertions(+), 3 deletions(-)

 diff --git a/meson.build b/meson.build
-index 4c85736ec3..57f666d722 100644
+index 3bc039f60f..067e8956a7 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2130,6 +2130,7 @@ endif
+@@ -1923,6 +1923,7 @@ endif
 has_gettid = cc.has_function('gettid')
 
 libuuid = cc.find_library('uuid', required: true)
@@ -25,7 +25,7 @@ index 4c85736ec3..57f666d722 100644
 libproxmox_backup_qemu = cc.find_library('proxmox_backup_qemu', required: true)
 
 # libselinux
-@@ -3744,7 +3745,7 @@ if have_block
+@@ -3530,7 +3531,7 @@ if have_block
   if host_os == 'windows'
     system_ss.add(files('os-win32.c'))
   else
@@ -35,7 +35,7 @@ index 4c85736ec3..57f666d722 100644
 endif
 
 diff --git a/os-posix.c b/os-posix.c
-index 43f9a43f3f..a47e46d1c2 100644
+index a4284e2c07..197a2120fd 100644
 --- a/os-posix.c
 +++ b/os-posix.c
@@ -29,6 +29,8 @@
@@ -47,7 +47,7 @@ index 43f9a43f3f..a47e46d1c2 100644
 
 #include "qemu/error-report.h"
 #include "qemu/log.h"
-@@ -306,9 +308,10 @@ void os_setup_post(void)
+@@ -302,9 +304,10 @@ void os_setup_post(void)
 
         dup2(fd, 0);
         dup2(fd, 1);
--- a/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
+++ b/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
@@ -26,52 +26,46 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 create mode 100644 migration/pbs-state.c

 diff --git a/include/migration/misc.h b/include/migration/misc.h
-index 804eb23c06..c75b146ae6 100644
+index c9e200f4eb..12c99ebc69 100644
 --- a/include/migration/misc.h
 +++ b/include/migration/misc.h
-@@ -106,4 +106,7 @@ bool migration_incoming_postcopy_advised(void);
- /* True if background snapshot is active */
- bool migration_in_bg_snapshot(void);
+@@ -117,4 +117,7 @@ bool migration_in_bg_snapshot(void);
+ /* migration/block-dirty-bitmap.c */
+ void dirty_bitmap_mig_init(void);
 
 +/* migration/pbs-state.c */
 +void pbs_state_mig_init(void);
 +
 #endif
 diff --git a/migration/meson.build b/migration/meson.build
-index 075b013971..eca57cb2a3 100644
+index 800f12a60d..35a4306183 100644
 --- a/migration/meson.build
 +++ b/migration/meson.build
-@@ -8,6 +8,7 @@ migration_files = files(
+@@ -7,7 +7,9 @@ migration_files = files(
+   'vmstate.c',
   'qemu-file.c',
   'yank_functions.c',
+  'pbs-state.c',
 )
 +system_ss.add(libproxmox_backup_qemu)
 
 system_ss.add(files(
   'block-dirty-bitmap.c',
-@@ -27,6 +28,7 @@ system_ss.add(files(
-   'multifd-zlib.c',
-   'multifd-zero-page.c',
-   'options.c',
-+  'pbs-state.c',
-   'postcopy-ram.c',
-   'savevm.c',
-   'savevm-async.c',
 diff --git a/migration/migration.c b/migration/migration.c
-index 8c5bd0a75c..491d9aa017 100644
+index 86bf76e925..b8d7e471a4 100644
 --- a/migration/migration.c
 +++ b/migration/migration.c
-@@ -266,6 +266,7 @@ void migration_object_init(void)
- 
-     /* Initialize cpu throttle timers */
-     cpu_throttle_init();
+@@ -239,6 +239,7 @@ void migration_object_init(void)
+     blk_mig_init();
+     ram_mig_init();
+     dirty_bitmap_mig_init();
 +    pbs_state_mig_init();
 }
 
 typedef struct {
 diff --git a/migration/pbs-state.c b/migration/pbs-state.c
 new file mode 100644
-index 0000000000..a97187e4d7
+index 0000000000..887e998b9e
 --- /dev/null
 +++ b/migration/pbs-state.c
@@ -0,0 +1,104 @@
@@ -120,7 +114,7 @@ index 0000000000..a97187e4d7
 +}
 +
 +/* serialize PBS state and send to target via f, called on source */
-+static int pbs_state_save_setup(QEMUFile *f, void *opaque, Error **errp)
+static int pbs_state_save_setup(QEMUFile *f, void *opaque)
 +{
 +    size_t buf_size;
 +    uint8_t *buf = proxmox_export_state(&buf_size);
@@ -180,10 +174,10 @@ index 0000000000..a97187e4d7
 +                         NULL);
 +}
 diff --git a/pve-backup.c b/pve-backup.c
-index fea0152de0..faa6a9b93c 100644
+index c755bf302b..5ebb6a3947 100644
 --- a/pve-backup.c
 +++ b/pve-backup.c
-@@ -1083,6 +1083,7 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
+@@ -1085,6 +1085,7 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
     ret->pbs_library_version = g_strdup(proxmox_backup_qemu_version());
     ret->pbs_dirty_bitmap = true;
     ret->pbs_dirty_bitmap_savevm = true;
@@ -192,7 +186,7 @@ index fea0152de0..faa6a9b93c 100644
     ret->pbs_masterkey = true;
     ret->backup_max_workers = true;
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index d45e8975a7..9795247c1f 100644
+index e7cf3d94f3..282e2e8a8c 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
@@ -1004,6 +1004,11 @@
--- a/debian/patches/pve/0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch
+++ b/debian/patches/pve/0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch
@@ -15,22 +15,18 @@ transferred.
 Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- migration/block-dirty-bitmap.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ migration/block-dirty-bitmap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
-index a7d55048c2..44078ea670 100644
+index 2708abf3d7..fb17c01308 100644
 --- a/migration/block-dirty-bitmap.c
 +++ b/migration/block-dirty-bitmap.c
-@@ -539,7 +539,11 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
-         }
+@@ -540,7 +540,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
 
-         if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, errp)) {
+         if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, &local_err)) {
+             error_report_err(local_err);
 -            return -1;
-+            if (errp != NULL) {
-+                error_report_err(*errp);
-+                *errp = NULL;
-+            }
 +            continue;
         }
 
--- a/debian/patches/pve/0036-PVE-fall-back-to-open-iscsi-initiatorname.patch
+++ b/debian/patches/pve/0036-PVE-fall-back-to-open-iscsi-initiatorname.patch
@@ -21,7 +21,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 30 insertions(+)

 diff --git a/block/iscsi.c b/block/iscsi.c
-index 979bf90cb7..961714a4be 100644
+index 2ff14b7472..46f275fbf7 100644
 --- a/block/iscsi.c
 +++ b/block/iscsi.c
@@ -1392,12 +1392,42 @@ static char *get_initiator_name(QemuOpts *opts)
--- a/debian/patches/pve/0037-PVE-block-stream-increase-chunk-size.patch
+++ b/debian/patches/pve/0037-PVE-block-stream-increase-chunk-size.patch
@@ -11,7 +11,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/block/stream.c b/block/stream.c
-index 9076203193..1d1c65f061 100644
+index 7031eef12b..d2da83ae7c 100644
 --- a/block/stream.c
 +++ b/block/stream.c
@@ -27,7 +27,7 @@ enum {
--- a/debian/patches/pve/0038-block-add-alloc-track-driver.patch
+++ b/debian/patches/pve/0038-block-add-alloc-track-driver.patch
@@ -42,7 +42,7 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>

 diff --git a/block/alloc-track.c b/block/alloc-track.c
 new file mode 100644
-index 0000000000..b4a9851144
+index 0000000000..b9f8ea9137
 --- /dev/null
 +++ b/block/alloc-track.c
@@ -0,0 +1,366 @@
@@ -386,7 +386,7 @@ index 0000000000..b4a9851144
 +    .format_name                      = "alloc-track",
 +    .instance_size                    = sizeof(BDRVAllocTrackState),
 +
-+    .bdrv_open                        = track_open,
+    .bdrv_file_open                   = track_open,
 +    .bdrv_close                       = track_close,
 +    .bdrv_co_getlength                = track_co_getlength,
 +    .bdrv_child_perm                  = track_child_perm,
@@ -413,7 +413,7 @@ index 0000000000..b4a9851144
 +
 +block_init(bdrv_alloc_track_init);
 diff --git a/block/meson.build b/block/meson.build
-index e178047ec9..7ef7250d31 100644
+index 1945e04eeb..2873f3a25a 100644
 --- a/block/meson.build
 +++ b/block/meson.build
@@ -2,6 +2,7 @@ block_ss.add(genh)
@@ -425,7 +425,7 @@ index e178047ec9..7ef7250d31 100644
   'backup.c',
   'backup-dump.c',
 diff --git a/block/stream.c b/block/stream.c
-index 1d1c65f061..d499c8883f 100644
+index d2da83ae7c..f941cba14e 100644
 --- a/block/stream.c
 +++ b/block/stream.c
@@ -120,6 +120,40 @@ static int stream_prepare(Job *job)
--- a/debian/patches/pve/0039-Revert-block-rbd-workaround-for-ceph-issue-53784.patch
+++ b/debian/patches/pve/0039-Revert-block-rbd-workaround-for-ceph-issue-53784.patch
@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 2 insertions(+), 40 deletions(-)

 diff --git a/block/rbd.c b/block/rbd.c
-index 728bce3b1e..6c9a8e0add 100644
+index 63f60d41be..367db42dce 100644
 --- a/block/rbd.c
 +++ b/block/rbd.c
@@ -1515,7 +1515,6 @@ static int coroutine_fn qemu_rbd_co_block_status(BlockDriverState *bs,
--- a/debian/patches/pve/0040-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch
+++ b/debian/patches/pve/0040-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch
@@ -14,7 +14,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 5 insertions(+), 5 deletions(-)

 diff --git a/block/rbd.c b/block/rbd.c
-index 6c9a8e0add..6f5fe90f3a 100644
+index 367db42dce..347b121626 100644
 --- a/block/rbd.c
 +++ b/block/rbd.c
@@ -1474,11 +1474,11 @@ static int qemu_rbd_diff_iterate_cb(uint64_t offs, size_t len,
--- a/debian/patches/pve/0041-Revert-block-rbd-implement-bdrv_co_block_status.patch
+++ b/debian/patches/pve/0041-Revert-block-rbd-implement-bdrv_co_block_status.patch
@@ -24,7 +24,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 112 deletions(-)

 diff --git a/block/rbd.c b/block/rbd.c
-index 6f5fe90f3a..24e820d056 100644
+index 347b121626..e61b359b97 100644
 --- a/block/rbd.c
 +++ b/block/rbd.c
@@ -108,12 +108,6 @@ typedef struct RBDTask {
@@ -152,7 +152,7 @@ index 6f5fe90f3a..24e820d056 100644
 static int64_t coroutine_fn qemu_rbd_co_getlength(BlockDriverState *bs)
 {
     BDRVRBDState *s = bs->opaque;
-@@ -1801,7 +1690,6 @@ static BlockDriver bdrv_rbd = {
+@@ -1800,7 +1689,6 @@ static BlockDriver bdrv_rbd = {
 #ifdef LIBRBD_SUPPORTS_WRITE_ZEROES
     .bdrv_co_pwrite_zeroes  = qemu_rbd_co_pwrite_zeroes,
 #endif
--- a/debian/patches/pve/0042-alloc-track-error-out-when-auto-remove-is-not-set.patch
+++ b/debian/patches/pve/0042-alloc-track-error-out-when-auto-remove-is-not-set.patch
@@ -17,7 +17,7 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 1 file changed, 5 insertions(+), 2 deletions(-)

 diff --git a/block/alloc-track.c b/block/alloc-track.c
-index b4a9851144..fc7d58a5d0 100644
+index b9f8ea9137..f3ed2935c4 100644
 --- a/block/alloc-track.c
 +++ b/block/alloc-track.c
@@ -34,7 +34,6 @@ typedef struct {
--- a/debian/patches/pve/0043-alloc-track-avoid-seemingly-superfluous-child-permis.patch
+++ b/debian/patches/pve/0043-alloc-track-avoid-seemingly-superfluous-child-permis.patch
@@ -20,7 +20,7 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 1 file changed, 26 deletions(-)

 diff --git a/block/alloc-track.c b/block/alloc-track.c
-index fc7d58a5d0..b56425b7f0 100644
+index f3ed2935c4..29138dcc49 100644
 --- a/block/alloc-track.c
 +++ b/block/alloc-track.c
@@ -25,15 +25,9 @@
--- a/debian/patches/pve/0044-copy-before-write-allow-specifying-minimum-cluster-s.patch
+++ b/debian/patches/pve/0044-copy-before-write-allow-specifying-minimum-cluster-s.patch
@@ -0,0 +1,133 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fiona Ebner <f.ebner@proxmox.com>
+Date: Thu, 11 Apr 2024 11:29:26 +0200
+Subject: [PATCH] copy-before-write: allow specifying minimum cluster size
+
+Useful to make discard-source work in the context of backup fleecing
+when the fleecing image has a larger granularity than the backup
+target.
+
+Copy-before-write operations will use at least this granularity and in
+particular, discard requests to the source node will too. If the
+granularity is too small, they will just be aligned down in
+cbw_co_pdiscard_snapshot() and thus effectively ignored.
+
+The QAPI uses uint32 so the value will be non-negative, but still fit
+into a uint64_t.
+
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ block/block-copy.c         | 17 +++++++++++++----
+ block/copy-before-write.c  |  3 ++-
+ include/block/block-copy.h |  1 +
+ qapi/block-core.json       |  8 +++++++-
+ 4 files changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/block/block-copy.c b/block/block-copy.c
+index cc618e4561..12d662e9d4 100644
+--- a/block/block-copy.c
+++ b/block/block-copy.c
+@@ -310,6 +310,7 @@ void block_copy_set_copy_opts(BlockCopyState *s, bool use_copy_range,
+ }
+ 
+ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target,
+                                                 int64_t min_cluster_size,
+                                                  Error **errp)
+ {
+     int ret;
+@@ -335,7 +336,7 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target,
+                     "used. If the actual block size of the target exceeds "
+                     "this default, the backup may be unusable",
+                     BLOCK_COPY_CLUSTER_SIZE_DEFAULT);
+-        return BLOCK_COPY_CLUSTER_SIZE_DEFAULT;
+        return MAX(min_cluster_size, BLOCK_COPY_CLUSTER_SIZE_DEFAULT);
+     } else if (ret < 0 && !target_does_cow) {
+         error_setg_errno(errp, -ret,
+             "Couldn't determine the cluster size of the target image, "
+@@ -345,16 +346,18 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target,
+         return ret;
+     } else if (ret < 0 && target_does_cow) {
+         /* Not fatal; just trudge on ahead. */
+-        return BLOCK_COPY_CLUSTER_SIZE_DEFAULT;
+        return MAX(min_cluster_size, BLOCK_COPY_CLUSTER_SIZE_DEFAULT);
+     }
+ 
+-    return MAX(BLOCK_COPY_CLUSTER_SIZE_DEFAULT, bdi.cluster_size);
+    return MAX(min_cluster_size,
+               MAX(BLOCK_COPY_CLUSTER_SIZE_DEFAULT, bdi.cluster_size));
+ }
+ 
+ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
+                                      BlockDriverState *copy_bitmap_bs,
+                                      const BdrvDirtyBitmap *bitmap,
+                                      bool discard_source,
+                                     int64_t min_cluster_size,
+                                      Error **errp)
+ {
+     ERRP_GUARD();
+@@ -365,7 +368,13 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
+ 
+     GLOBAL_STATE_CODE();
+ 
+-    cluster_size = block_copy_calculate_cluster_size(target->bs, errp);
+    if (min_cluster_size && !is_power_of_2(min_cluster_size)) {
+        error_setg(errp, "min-cluster-size needs to be a power of 2");
+        return NULL;
+    }
+
+    cluster_size = block_copy_calculate_cluster_size(target->bs,
+                                                     min_cluster_size, errp);
+     if (cluster_size < 0) {
+         return NULL;
+     }
+diff --git a/block/copy-before-write.c b/block/copy-before-write.c
+index 853e01a1eb..47b3cdd09f 100644
+--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
+@@ -477,7 +477,8 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,
+ 
+     s->discard_source = flags & BDRV_O_CBW_DISCARD_SOURCE;
+     s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap,
+-                                  flags & BDRV_O_CBW_DISCARD_SOURCE, errp);
+                                  flags & BDRV_O_CBW_DISCARD_SOURCE,
+                                  opts->min_cluster_size, errp);
+     if (!s->bcs) {
+         error_prepend(errp, "Cannot create block-copy-state: ");
+         return -EINVAL;
+diff --git a/include/block/block-copy.h b/include/block/block-copy.h
+index bdc703bacd..77857c6c68 100644
+--- a/include/block/block-copy.h
+++ b/include/block/block-copy.h
+@@ -28,6 +28,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
+                                      BlockDriverState *copy_bitmap_bs,
+                                      const BdrvDirtyBitmap *bitmap,
+                                      bool discard_source,
+                                     int64_t min_cluster_size,
+                                      Error **errp);
+ 
+ /* Function should be called prior any actual copy request */
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index 282e2e8a8c..9caf04cbe9 100644
+--- a/qapi/block-core.json
+++ b/qapi/block-core.json
+@@ -4926,12 +4926,18 @@
+ #     @on-cbw-error parameter will decide how this failure is handled.
+ #     Default 0.  (Since 7.1)
+ #
+# @min-cluster-size: Minimum size of blocks used by copy-before-write
+#     operations.  Has to be a power of 2.  No effect if smaller than
+#     the maximum of the target's cluster size and 64 KiB.  Default 0.
+#     (Since 8.1)
+#
+ # Since: 6.2
+ ##
+ { 'struct': 'BlockdevOptionsCbw',
+   'base': 'BlockdevOptionsGenericFormat',
+   'data': { 'target': 'BlockdevRef', '*bitmap': 'BlockDirtyBitmap',
+-            '*on-cbw-error': 'OnCbwError', '*cbw-timeout': 'uint32' } }
+            '*on-cbw-error': 'OnCbwError', '*cbw-timeout': 'uint32',
+            '*min-cluster-size': 'uint32' } }
+ 
+ ##
+ # @BlockdevOptions:
--- a/debian/patches/pve/0045-backup-add-minimum-cluster-size-to-performance-optio.patch
+++ b/debian/patches/pve/0045-backup-add-minimum-cluster-size-to-performance-optio.patch
@@ -0,0 +1,106 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fiona Ebner <f.ebner@proxmox.com>
+Date: Thu, 11 Apr 2024 11:29:27 +0200
+Subject: [PATCH] backup: add minimum cluster size to performance options
+
+Useful to make discard-source work in the context of backup fleecing
+when the fleecing image has a larger granularity than the backup
+target.
+
+Backup/block-copy will use at least this granularity for copy operations
+and in particular, discard requests to the backup source will too. If
+the granularity is too small, they will just be aligned down in
+cbw_co_pdiscard_snapshot() and thus effectively ignored.
+
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ block/backup.c            | 2 +-
+ block/copy-before-write.c | 2 ++
+ block/copy-before-write.h | 1 +
+ blockdev.c                | 3 +++
+ qapi/block-core.json      | 9 +++++++--
+ 5 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/block/backup.c b/block/backup.c
+index 1963e47ab9..fe69723ada 100644
+--- a/block/backup.c
+++ b/block/backup.c
+@@ -434,7 +434,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
+     }
+ 
+     cbw = bdrv_cbw_append(bs, target, filter_node_name, discard_source,
+-                          &bcs, errp);
+                          perf->min_cluster_size, &bcs, errp);
+     if (!cbw) {
+         goto error;
+     }
+diff --git a/block/copy-before-write.c b/block/copy-before-write.c
+index 47b3cdd09f..bba58326d7 100644
+--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
+@@ -546,6 +546,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
+                                   BlockDriverState *target,
+                                   const char *filter_node_name,
+                                   bool discard_source,
+                                  int64_t min_cluster_size,
+                                   BlockCopyState **bcs,
+                                   Error **errp)
+ {
+@@ -564,6 +565,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
+     }
+     qdict_put_str(opts, "file", bdrv_get_node_name(source));
+     qdict_put_str(opts, "target", bdrv_get_node_name(target));
+    qdict_put_int(opts, "min-cluster-size", min_cluster_size);
+ 
+     top = bdrv_insert_node(source, opts, flags, errp);
+     if (!top) {
+diff --git a/block/copy-before-write.h b/block/copy-before-write.h
+index 01af0cd3c4..dc6cafe7fa 100644
+--- a/block/copy-before-write.h
+++ b/block/copy-before-write.h
+@@ -40,6 +40,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
+                                   BlockDriverState *target,
+                                   const char *filter_node_name,
+                                   bool discard_source,
+                                  int64_t min_cluster_size,
+                                   BlockCopyState **bcs,
+                                   Error **errp);
+ void bdrv_cbw_drop(BlockDriverState *bs);
+diff --git a/blockdev.c b/blockdev.c
+index 1054a69279..cbe224387b 100644
+--- a/blockdev.c
+++ b/blockdev.c
+@@ -2654,6 +2654,9 @@ static BlockJob *do_backup_common(BackupCommon *backup,
+         if (backup->x_perf->has_max_chunk) {
+             perf.max_chunk = backup->x_perf->max_chunk;
+         }
+        if (backup->x_perf->has_min_cluster_size) {
+            perf.min_cluster_size = backup->x_perf->min_cluster_size;
+        }
+     }
+ 
+     if ((backup->sync == MIRROR_SYNC_MODE_BITMAP) ||
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index 9caf04cbe9..df934647ed 100644
+--- a/qapi/block-core.json
+++ b/qapi/block-core.json
+@@ -1790,11 +1790,16 @@
+ #     it should not be less than job cluster size which is calculated
+ #     as maximum of target image cluster size and 64k.  Default 0.
+ #
+# @min-cluster-size: Minimum size of blocks used by copy-before-write
+#     and background copy operations.  Has to be a power of 2.  No
+#     effect if smaller than the maximum of the target's cluster size
+#     and 64 KiB.  Default 0. (Since 8.1)
+#
+ # Since: 6.0
+ ##
+ { 'struct': 'BackupPerf',
+-  'data': { '*use-copy-range': 'bool',
+-            '*max-workers': 'int', '*max-chunk': 'int64' } }
+  'data': { '*use-copy-range': 'bool', '*max-workers': 'int',
+            '*max-chunk': 'int64', '*min-cluster-size': 'uint32' } }
+ 
+ ##
+ # @BackupCommon:
--- a/debian/patches/pve/0046-PVE-backup-add-fleecing-option.patch
+++ b/debian/patches/pve/0046-PVE-backup-add-fleecing-option.patch
@@ -68,10 +68,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 3 files changed, 142 insertions(+), 4 deletions(-)

 diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
-index 439a7a14c8..d0e7771dcc 100644
+index 5000c084c5..70b3de4c7e 100644
 --- a/block/monitor/block-hmp-cmds.c
 +++ b/block/monitor/block-hmp-cmds.c
-@@ -1044,6 +1044,7 @@ void coroutine_fn hmp_backup(Monitor *mon, const QDict *qdict)
+@@ -1043,6 +1043,7 @@ void coroutine_fn hmp_backup(Monitor *mon, const QDict *qdict)
         NULL, NULL,
         devlist, qdict_haskey(qdict, "speed"), speed,
         false, 0, // BackupPerf max-workers
@@ -80,7 +80,7 @@ index 439a7a14c8..d0e7771dcc 100644
 
     hmp_handle_error(mon, error);
 diff --git a/pve-backup.c b/pve-backup.c
-index faa6a9b93c..4b0820c8a7 100644
+index 5ebb6a3947..a747d12d3d 100644
 --- a/pve-backup.c
 +++ b/pve-backup.c
@@ -7,9 +7,11 @@
@@ -252,7 +252,7 @@ index faa6a9b93c..4b0820c8a7 100644
 +                }
 +                BlockDriverState *fleecing_bs = blk_bs(fleecing_blk);
 +                if (!bdrv_co_is_inserted(fleecing_bs)) {
-+                    error_setg(errp, "Device '%s' has no medium", fleecing_devid);
+                    error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, fleecing_devid);
 +                    goto err;
 +                }
 +                /*
@@ -286,7 +286,7 @@ index faa6a9b93c..4b0820c8a7 100644
     bdrv_graph_co_rdunlock();
     if (local_err) {
         error_propagate(errp, local_err);
-@@ -1087,5 +1215,6 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
+@@ -1089,5 +1217,6 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
     ret->query_bitmap_info = true;
     ret->pbs_masterkey = true;
     ret->backup_max_workers = true;
@@ -294,7 +294,7 @@ index faa6a9b93c..4b0820c8a7 100644
     return ret;
 }
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 9795247c1f..c581f1f238 100644
+index df934647ed..ff441d4258 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
@@ -948,6 +948,10 @@
--- a/debian/patches/pve/0046-PVE-backup-fixup-error-handling-for-fleecing.patch
+++ b/debian/patches/pve/0046-PVE-backup-fixup-error-handling-for-fleecing.patch
@@ -1,103 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Thu, 7 Nov 2024 17:51:14 +0100
-Subject: [PATCH] PVE backup: fixup error handling for fleecing
-
-The drained section needs to be terminated before breaking out of the
-loop in the error scenarios. Otherwise, guest IO on the drive would
-become stuck.
-
-If the job is created successfully, then the job completion callback
-will clean up the snapshot access block nodes. In case failure
-happened before the job is created, there was no cleanup for the
-snapshot access block nodes yet. Add it.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- pve-backup.c | 38 +++++++++++++++++++++++++-------------
- 1 file changed, 25 insertions(+), 13 deletions(-)
-
-diff --git a/pve-backup.c b/pve-backup.c
-index 81697d9bf9..320c660589 100644
--- a/pve-backup.c
-+++ b/pve-backup.c
-@@ -357,22 +357,23 @@ static void coroutine_fn pvebackup_co_complete_stream(void *opaque)
-     qemu_co_mutex_unlock(&backup_state.backup_mutex);
- }
- 
-static void pvebackup_complete_cb(void *opaque, int ret)
-+static void cleanup_snapshot_access(PVEBackupDevInfo *di)
- {
-    PVEBackupDevInfo *di = opaque;
-    di->completed_ret = ret;
-
-    /*
-     * Handle block-graph specific cleanup (for fleecing) outside of the coroutine, because the work
-     * won't be done as a coroutine anyways:
-     * - For snapshot_access, allows doing bdrv_unref() directly. Doing it via bdrv_co_unref() would
-     *   just spawn a BH calling bdrv_unref().
-     * - For cbw, draining would need to spawn a BH.
-     */
-     if (di->fleecing.snapshot_access) {
-         bdrv_unref(di->fleecing.snapshot_access);
-         di->fleecing.snapshot_access = NULL;
-     }
-+    if (di->fleecing.cbw) {
-+        bdrv_cbw_drop(di->fleecing.cbw);
-+        di->fleecing.cbw = NULL;
-+    }
-+}
-+
-+static void pvebackup_complete_cb(void *opaque, int ret)
-+{
-+    PVEBackupDevInfo *di = opaque;
-+    di->completed_ret = ret;
-+
-     if (di->fleecing.cbw) {
-         /*
-          * With fleecing, failure for cbw does not fail the guest write, but only sets the snapshot
-@@ -383,10 +384,17 @@ static void pvebackup_complete_cb(void *opaque, int ret)
-         if (di->completed_ret == -EACCES && snapshot_error) {
-             di->completed_ret = snapshot_error;
-         }
-        bdrv_cbw_drop(di->fleecing.cbw);
-        di->fleecing.cbw = NULL;
-     }
- 
-+    /*
-+     * Handle block-graph specific cleanup (for fleecing) outside of the coroutine, because the work
-+     * won't be done as a coroutine anyways:
-+     * - For snapshot_access, allows doing bdrv_unref() directly. Doing it via bdrv_co_unref() would
-+     *   just spawn a BH calling bdrv_unref().
-+     * - For cbw, draining would need to spawn a BH.
-+     */
-+    cleanup_snapshot_access(di);
-+
-     /*
-      * Needs to happen outside of coroutine, because it takes the graph write lock.
-      */
-@@ -587,6 +595,7 @@ static void create_backup_jobs_bh(void *opaque) {
-             if (!di->fleecing.cbw) {
-                 error_setg(errp, "appending cbw node for fleecing failed: %s",
-                            local_err ? error_get_pretty(local_err) : "unknown error");
-+                bdrv_drained_end(di->bs);
-                 break;
-             }
- 
-@@ -599,6 +608,8 @@ static void create_backup_jobs_bh(void *opaque) {
-             if (!di->fleecing.snapshot_access) {
-                 error_setg(errp, "setting up snapshot access for fleecing failed: %s",
-                            local_err ? error_get_pretty(local_err) : "unknown error");
-+                cleanup_snapshot_access(di);
-+                bdrv_drained_end(di->bs);
-                 break;
-             }
-             source_bs = di->fleecing.snapshot_access;
-@@ -637,6 +648,7 @@ static void create_backup_jobs_bh(void *opaque) {
-         }
- 
-         if (!job || local_err) {
-+            cleanup_snapshot_access(di);
-             error_setg(errp, "backup_job_create failed: %s",
-                        local_err ? error_get_pretty(local_err) : "null");
-             break;
--- a/debian/patches/pve/0047-PVE-backup-factor-out-setting-up-snapshot-access-for.patch
+++ b/debian/patches/pve/0047-PVE-backup-factor-out-setting-up-snapshot-access-for.patch
@@ -1,135 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Thu, 7 Nov 2024 17:51:15 +0100
-Subject: [PATCH] PVE backup: factor out setting up snapshot access for
- fleecing
-
-Avoids some line bloat in the create_backup_jobs_bh() function and is
-in preparation for setting up the snapshot access independently of
-fleecing, in particular that will be useful for providing access to
-the snapshot via NBD.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- pve-backup.c | 95 ++++++++++++++++++++++++++++++++--------------------
- 1 file changed, 58 insertions(+), 37 deletions(-)
-
-diff --git a/pve-backup.c b/pve-backup.c
-index 320c660589..d8d0c04b0f 100644
--- a/pve-backup.c
-+++ b/pve-backup.c
-@@ -525,6 +525,62 @@ static int coroutine_fn pvebackup_co_add_config(
-     goto out;
- }
- 
-+/*
-+ * Setup a snapshot-access block node for a device with associated fleecing image.
-+ */
-+static int setup_snapshot_access(PVEBackupDevInfo *di, Error **errp)
-+{
-+    Error *local_err = NULL;
-+
-+    if (!di->fleecing.bs) {
-+        error_setg(errp, "no associated fleecing image");
-+        return -1;
-+    }
-+
-+    QDict *cbw_opts = qdict_new();
-+    qdict_put_str(cbw_opts, "driver", "copy-before-write");
-+    qdict_put_str(cbw_opts, "file", bdrv_get_node_name(di->bs));
-+    qdict_put_str(cbw_opts, "target", bdrv_get_node_name(di->fleecing.bs));
-+
-+    if (di->bitmap) {
-+        /*
-+         * Only guest writes to parts relevant for the backup need to be intercepted with
-+         * old data being copied to the fleecing image.
-+         */
-+        qdict_put_str(cbw_opts, "bitmap.node", bdrv_get_node_name(di->bs));
-+        qdict_put_str(cbw_opts, "bitmap.name", bdrv_dirty_bitmap_name(di->bitmap));
-+    }
-+    /*
-+     * Fleecing storage is supposed to be fast and it's better to break backup than guest
-+     * writes. Certain guest drivers like VirtIO-win have 60 seconds timeout by default, so
-+     * abort a bit before that.
-+     */
-+    qdict_put_str(cbw_opts, "on-cbw-error", "break-snapshot");
-+    qdict_put_int(cbw_opts, "cbw-timeout", 45);
-+
-+    di->fleecing.cbw = bdrv_insert_node(di->bs, cbw_opts, BDRV_O_RDWR, &local_err);
-+
-+    if (!di->fleecing.cbw) {
-+        error_setg(errp, "appending cbw node for fleecing failed: %s",
-+                   local_err ? error_get_pretty(local_err) : "unknown error");
-+        return -1;
-+    }
-+
-+    QDict *snapshot_access_opts = qdict_new();
-+    qdict_put_str(snapshot_access_opts, "driver", "snapshot-access");
-+    qdict_put_str(snapshot_access_opts, "file", bdrv_get_node_name(di->fleecing.cbw));
-+
-+    di->fleecing.snapshot_access =
-+        bdrv_open(NULL, NULL, snapshot_access_opts, BDRV_O_RDWR | BDRV_O_UNMAP, &local_err);
-+    if (!di->fleecing.snapshot_access) {
-+        error_setg(errp, "setting up snapshot access for fleecing failed: %s",
-+                   local_err ? error_get_pretty(local_err) : "unknown error");
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
- /*
-  * backup_job_create can *not* be run from a coroutine, so this can't either.
-  * The caller is responsible that backup_mutex is held nonetheless.
-@@ -569,49 +625,14 @@ static void create_backup_jobs_bh(void *opaque) {
-         const char *job_id = bdrv_get_device_name(di->bs);
-         bdrv_graph_co_rdunlock();
-         if (di->fleecing.bs) {
-            QDict *cbw_opts = qdict_new();
-            qdict_put_str(cbw_opts, "driver", "copy-before-write");
-            qdict_put_str(cbw_opts, "file", bdrv_get_node_name(di->bs));
-            qdict_put_str(cbw_opts, "target", bdrv_get_node_name(di->fleecing.bs));
-
-            if (di->bitmap) {
-                /*
-                 * Only guest writes to parts relevant for the backup need to be intercepted with
-                 * old data being copied to the fleecing image.
-                 */
-                qdict_put_str(cbw_opts, "bitmap.node", bdrv_get_node_name(di->bs));
-                qdict_put_str(cbw_opts, "bitmap.name", bdrv_dirty_bitmap_name(di->bitmap));
-            }
-            /*
-             * Fleecing storage is supposed to be fast and it's better to break backup than guest
-             * writes. Certain guest drivers like VirtIO-win have 60 seconds timeout by default, so
-             * abort a bit before that.
-             */
-            qdict_put_str(cbw_opts, "on-cbw-error", "break-snapshot");
-            qdict_put_int(cbw_opts, "cbw-timeout", 45);
-
-            di->fleecing.cbw = bdrv_insert_node(di->bs, cbw_opts, BDRV_O_RDWR, &local_err);
-
-            if (!di->fleecing.cbw) {
-                error_setg(errp, "appending cbw node for fleecing failed: %s",
-                           local_err ? error_get_pretty(local_err) : "unknown error");
-                bdrv_drained_end(di->bs);
-                break;
-            }
-
-            QDict *snapshot_access_opts = qdict_new();
-            qdict_put_str(snapshot_access_opts, "driver", "snapshot-access");
-            qdict_put_str(snapshot_access_opts, "file", bdrv_get_node_name(di->fleecing.cbw));
-
-            di->fleecing.snapshot_access =
-                bdrv_open(NULL, NULL, snapshot_access_opts, BDRV_O_RDWR | BDRV_O_UNMAP, &local_err);
-            if (!di->fleecing.snapshot_access) {
-+            if (setup_snapshot_access(di, &local_err) < 0) {
-                 error_setg(errp, "setting up snapshot access for fleecing failed: %s",
-                            local_err ? error_get_pretty(local_err) : "unknown error");
-                 cleanup_snapshot_access(di);
-                 bdrv_drained_end(di->bs);
-                 break;
-             }
-+
-             source_bs = di->fleecing.snapshot_access;
-             discard_source = true;
- 
--- a/debian/patches/pve/0047-PVE-backup-improve-error-when-copy-before-write-fail.patch
+++ b/debian/patches/pve/0047-PVE-backup-improve-error-when-copy-before-write-fail.patch
@@ -21,7 +21,7 @@ Tested-by: Friedrich Weber <f.weber@proxmox.com>
 3 files changed, 22 insertions(+), 6 deletions(-)

 diff --git a/block/copy-before-write.c b/block/copy-before-write.c
-index 81afeff1c7..fdf9cdc0cd 100644
+index bba58326d7..50cc4c7aae 100644
 --- a/block/copy-before-write.c
 +++ b/block/copy-before-write.c
@@ -27,6 +27,7 @@
@@ -32,7 +32,7 @@ index 81afeff1c7..fdf9cdc0cd 100644
 #include "qemu/cutils.h"
 #include "qapi/error.h"
 #include "block/block_int.h"
-@@ -75,7 +76,8 @@ typedef struct BDRVCopyBeforeWriteState {
+@@ -74,7 +75,8 @@ typedef struct BDRVCopyBeforeWriteState {
      * @snapshot_error is normally zero. But on first copy-before-write failure
      * when @on_cbw_error == ON_CBW_ERROR_BREAK_SNAPSHOT, @snapshot_error takes
      * value of this error (<0). After that all in-flight and further
@@ -42,7 +42,7 @@ index 81afeff1c7..fdf9cdc0cd 100644
      */
     int snapshot_error;
 } BDRVCopyBeforeWriteState;
-@@ -115,7 +117,7 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs,
+@@ -114,7 +116,7 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs,
         return 0;
     }
 
@@ -51,7 +51,7 @@ index 81afeff1c7..fdf9cdc0cd 100644
         return 0;
     }
 
-@@ -139,9 +141,7 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs,
+@@ -138,9 +140,7 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs,
     WITH_QEMU_LOCK_GUARD(&s->lock) {
         if (ret < 0) {
             assert(s->on_cbw_error == ON_CBW_ERROR_BREAK_SNAPSHOT);
@@ -62,7 +62,7 @@ index 81afeff1c7..fdf9cdc0cd 100644
         } else {
             bdrv_set_dirty_bitmap(s->done_bitmap, off, end - off);
         }
-@@ -215,7 +215,7 @@ cbw_snapshot_read_lock(BlockDriverState *bs, int64_t offset, int64_t bytes,
+@@ -214,7 +214,7 @@ cbw_snapshot_read_lock(BlockDriverState *bs, int64_t offset, int64_t bytes,
 
     QEMU_LOCK_GUARD(&s->lock);
 
@@ -71,7 +71,7 @@ index 81afeff1c7..fdf9cdc0cd 100644
         g_free(req);
         return NULL;
     }
-@@ -595,6 +595,12 @@ void bdrv_cbw_drop(BlockDriverState *bs)
+@@ -585,6 +585,12 @@ void bdrv_cbw_drop(BlockDriverState *bs)
     bdrv_unref(bs);
 }
 
@@ -85,7 +85,7 @@ index 81afeff1c7..fdf9cdc0cd 100644
 {
     bdrv_register(&bdrv_cbw_filter);
 diff --git a/block/copy-before-write.h b/block/copy-before-write.h
-index 2a5d4ba693..969da3620f 100644
+index dc6cafe7fa..a27d2d7d9f 100644
 --- a/block/copy-before-write.h
 +++ b/block/copy-before-write.h
@@ -44,5 +44,6 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
@@ -96,7 +96,7 @@ index 2a5d4ba693..969da3620f 100644
 
 #endif /* COPY_BEFORE_WRITE_H */
 diff --git a/pve-backup.c b/pve-backup.c
-index 4b0820c8a7..81697d9bf9 100644
+index a747d12d3d..4e730aa3da 100644
 --- a/pve-backup.c
 +++ b/pve-backup.c
@@ -374,6 +374,15 @@ static void pvebackup_complete_cb(void *opaque, int ret)
--- a/debian/patches/pve/0048-PVE-backup-save-device-name-in-device-info-structure.patch
+++ b/debian/patches/pve/0048-PVE-backup-save-device-name-in-device-info-structure.patch
@@ -1,135 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Thu, 7 Nov 2024 17:51:16 +0100
-Subject: [PATCH] PVE backup: save device name in device info structure
-
-The device name needs to be queried while holding the graph read lock
-and since it doesn't change during the whole operation, just get it
-once during setup and avoid the need to query it again in different
-places.
-
-Also in preparation to use it more often in error messages and for the
-upcoming external backup access API.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- pve-backup.c | 29 +++++++++++++++--------------
- 1 file changed, 15 insertions(+), 14 deletions(-)
-
-diff --git a/pve-backup.c b/pve-backup.c
-index d8d0c04b0f..e2110ce0db 100644
--- a/pve-backup.c
-+++ b/pve-backup.c
-@@ -94,6 +94,7 @@ typedef struct PVEBackupDevInfo {
-     size_t size;
-     uint64_t block_size;
-     uint8_t dev_id;
-+    char* device_name;
-     int completed_ret; // INT_MAX if not completed
-     BdrvDirtyBitmap *bitmap;
-     BlockDriverState *target;
-@@ -327,6 +328,8 @@ static void coroutine_fn pvebackup_co_complete_stream(void *opaque)
-     }
- 
-     di->bs = NULL;
-+    g_free(di->device_name);
-+    di->device_name = NULL;
- 
-     assert(di->target == NULL);
- 
-@@ -621,9 +624,6 @@ static void create_backup_jobs_bh(void *opaque) {
- 
-         BlockDriverState *source_bs = di->bs;
-         bool discard_source = false;
-        bdrv_graph_co_rdlock();
-        const char *job_id = bdrv_get_device_name(di->bs);
-        bdrv_graph_co_rdunlock();
-         if (di->fleecing.bs) {
-             if (setup_snapshot_access(di, &local_err) < 0) {
-                 error_setg(errp, "setting up snapshot access for fleecing failed: %s",
-@@ -654,7 +654,7 @@ static void create_backup_jobs_bh(void *opaque) {
-         }
- 
-         BlockJob *job = backup_job_create(
-            job_id, source_bs, di->target, backup_state.speed, sync_mode, di->bitmap,
-+            di->device_name, source_bs, di->target, backup_state.speed, sync_mode, di->bitmap,
-             bitmap_mode, false, discard_source, NULL, &perf, BLOCKDEV_ON_ERROR_REPORT,
-             BLOCKDEV_ON_ERROR_REPORT, JOB_DEFAULT, pvebackup_complete_cb, di, backup_state.txn,
-             &local_err);
-@@ -751,6 +751,7 @@ static GList coroutine_fn GRAPH_RDLOCK *get_device_info(
-             }
-             PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
-             di->bs = bs;
-+            di->device_name = g_strdup(bdrv_get_device_name(bs));
- 
-             if (fleecing && device_uses_fleecing(*d)) {
-                 g_autofree gchar *fleecing_devid = g_strconcat(*d, "-fleecing", NULL);
-@@ -789,6 +790,7 @@ static GList coroutine_fn GRAPH_RDLOCK *get_device_info(
- 
-             PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
-             di->bs = bs;
-+            di->device_name = g_strdup(bdrv_get_device_name(bs));
-             di_list = g_list_append(di_list, di);
-         }
-     }
-@@ -956,9 +958,6 @@ UuidInfo coroutine_fn *qmp_backup(
- 
-             di->block_size = dump_cb_block_size;
- 
-            bdrv_graph_co_rdlock();
-            const char *devname = bdrv_get_device_name(di->bs);
-            bdrv_graph_co_rdunlock();
-             PBSBitmapAction action = PBS_BITMAP_ACTION_NOT_USED;
-             size_t dirty = di->size;
- 
-@@ -973,7 +972,8 @@ UuidInfo coroutine_fn *qmp_backup(
-                     }
-                     action = PBS_BITMAP_ACTION_NEW;
-                 } else {
-                    expect_only_dirty = proxmox_backup_check_incremental(pbs, devname, di->size) != 0;
-+                    expect_only_dirty =
-+                        proxmox_backup_check_incremental(pbs, di->device_name, di->size) != 0;
-                 }
- 
-                 if (expect_only_dirty) {
-@@ -997,7 +997,8 @@ UuidInfo coroutine_fn *qmp_backup(
-                 }
-             }
- 
-            int dev_id = proxmox_backup_co_register_image(pbs, devname, di->size, expect_only_dirty, errp);
-+            int dev_id = proxmox_backup_co_register_image(pbs, di->device_name, di->size,
-+                                                          expect_only_dirty, errp);
-             if (dev_id < 0) {
-                 goto err_mutex;
-             }
-@@ -1009,7 +1010,7 @@ UuidInfo coroutine_fn *qmp_backup(
-             di->dev_id = dev_id;
- 
-             PBSBitmapInfo *info = g_malloc(sizeof(*info));
-            info->drive = g_strdup(devname);
-+            info->drive = g_strdup(di->device_name);
-             info->action = action;
-             info->size = di->size;
-             info->dirty = dirty;
-@@ -1032,10 +1033,7 @@ UuidInfo coroutine_fn *qmp_backup(
-                 goto err_mutex;
-             }
- 
-            bdrv_graph_co_rdlock();
-            const char *devname = bdrv_get_device_name(di->bs);
-            bdrv_graph_co_rdunlock();
-            di->dev_id = vma_writer_register_stream(vmaw, devname, di->size);
-+            di->dev_id = vma_writer_register_stream(vmaw, di->device_name, di->size);
-             if (di->dev_id <= 0) {
-                 error_set(errp, ERROR_CLASS_GENERIC_ERROR,
-                           "register_stream failed");
-@@ -1146,6 +1144,9 @@ err:
-             bdrv_co_unref(di->target);
-         }
- 
-+        g_free(di->device_name);
-+        di->device_name = NULL;
-+
-         g_free(di);
-     }
-     g_list_free(di_list);
--- a/debian/patches/pve/0049-PVE-backup-include-device-name-in-error-when-setting.patch
+++ b/debian/patches/pve/0049-PVE-backup-include-device-name-in-error-when-setting.patch
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Thu, 7 Nov 2024 17:51:17 +0100
-Subject: [PATCH] PVE backup: include device name in error when setting up
- snapshot access fails
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- pve-backup.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/pve-backup.c b/pve-backup.c
-index e2110ce0db..32352fb5ec 100644
--- a/pve-backup.c
-+++ b/pve-backup.c
-@@ -626,7 +626,8 @@ static void create_backup_jobs_bh(void *opaque) {
-         bool discard_source = false;
-         if (di->fleecing.bs) {
-             if (setup_snapshot_access(di, &local_err) < 0) {
-                error_setg(errp, "setting up snapshot access for fleecing failed: %s",
-+                error_setg(errp, "%s - setting up snapshot access for fleecing failed: %s",
-+                           di->device_name,
-                            local_err ? error_get_pretty(local_err) : "unknown error");
-                 cleanup_snapshot_access(di);
-                 bdrv_drained_end(di->bs);
--- a/debian/patches/pve/0050-adapt-machine-version-deprecation-for-Proxmox-VE.patch
+++ b/debian/patches/pve/0050-adapt-machine-version-deprecation-for-Proxmox-VE.patch
@@ -1,137 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Fri, 3 Jan 2025 14:03:12 +0100
-Subject: [PATCH] adapt machine version deprecation for Proxmox VE
-
-In commit a35f8577a0 ("include/hw: add macros for deprecation &
-removal of versioned machines"), a new machine version deprecation and
-removal policy was introduced. After only 3 years a machine version
-will be deprecated while being removed after 6 years.
-
-The deprecation is a bit early considering major PVE releases are
-approximately every 2 years. This means that a deprecation warning can
-already happen for a machine version that was introduced during the
-previous major release. This would scare users for no good reason, so
-avoid deprecating machine versions in PVE too early and define a
-baseline of machine versions that will be supported throughout a
-single major PVE release.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- include/hw/boards.h | 78 +++++++++++++++++++++++++++++----------------
- 1 file changed, 51 insertions(+), 27 deletions(-)
-
-diff --git a/include/hw/boards.h b/include/hw/boards.h
-index d1741ea121..3f9befda14 100644
--- a/include/hw/boards.h
-+++ b/include/hw/boards.h
-@@ -631,42 +631,66 @@ struct MachineState {
- 
- 
- /*
- * How many years/major releases for each phase
- * of the life cycle. Assumes use of versioning
- * scheme where major is bumped each year
-+ * Baseline of machine versions that are still considered supported throughout
-+ * current major Proxmox VE release. Machine versions older than this are
-+ * considered to be deprecated in Proxmox VE.
-+ *
-+ * Machine versions older than 6 years are removed just like in upstream QEMU.
-+ * (policy takes effect with QEMU 10.1). Assumes yearly major QEMU release.
-+ *
-+ * QEMU release cylce N.0 in ~April, N.1 in ~August, N.2 in ~December
-+ * Debian/PVE release cylce ~every two years in summer
-+ *
-+ * PVE - last QEMU - machine versions dropped - baseline
-+ *   8         9.2              2.3 and older        2.4
-+ *   9        11.2              5.2 and older        6.0
-+ *  10        13.2              7.2 and older        8.0
-+ */
-+#define MACHINE_VER_BASELINE_PVE_MAJOR 2
-+#define MACHINE_VER_BASELINE_PVE_MINOR 4
-+#define MACHINE_VER_DELETION_MAJOR (QEMU_VERSION_MAJOR - 6)
-+#define MACHINE_VER_DELETION_MINOR QEMU_VERSION_MINOR
-+
-+/*
-+ * Proxmox VE needs to support the baseline throughout a major PVE release. So
-+ * a QEMU release where the baseline is already deleted cannot be used.
-+ * Removal policy after 6 years takes effect with QEMU 10.1.
-  */
-#define MACHINE_VER_DELETION_MAJOR 6
-#define MACHINE_VER_DEPRECATION_MAJOR 3
-+#if ((QEMU_VERSION_MAJOR > 10) || ((QEMU_VERSION_MAJOR == 10) && (QEMU_VERSION_MINOR >= 1)))
-+#if ((MACHINE_VER_BASELINE_PVE_MAJOR < MACHINE_VER_DELETION_MAJOR) || \
-+     ((MACHINE_VER_BASELINE_PVE_MAJOR == MACHINE_VER_DELETION_MAJOR) && \
-+      (MACHINE_VER_BASELINE_PVE_MINOR < MACHINE_VER_DELETION_MINOR)))
-+#error "Baseline machine version needed by Proxmox VE not supported anymore by this QEMU release"
-+#endif
-+#endif
- 
- /*
-  * Expands to a static string containing a deprecation
-  * message for a versioned machine type
-  */
- #define MACHINE_VER_DEPRECATION_MSG \
-    "machines more than " stringify(MACHINE_VER_DEPRECATION_MAJOR) \
-    " years old are subject to deletion after " \
-    stringify(MACHINE_VER_DELETION_MAJOR) " years"
-
-#define _MACHINE_VER_IS_EXPIRED_IMPL(cutoff, major, minor) \
-    (((QEMU_VERSION_MAJOR - major) > cutoff) || \
-     (((QEMU_VERSION_MAJOR - major) == cutoff) && \
-      (QEMU_VERSION_MINOR - minor) >= 0))
-
-#define _MACHINE_VER_IS_EXPIRED2(cutoff, major, minor) \
-    _MACHINE_VER_IS_EXPIRED_IMPL(cutoff, major, minor)
-#define _MACHINE_VER_IS_EXPIRED3(cutoff, major, minor, micro) \
-    _MACHINE_VER_IS_EXPIRED_IMPL(cutoff, major, minor)
-#define _MACHINE_VER_IS_EXPIRED4(cutoff, major, minor, _unused, tag) \
-    _MACHINE_VER_IS_EXPIRED_IMPL(cutoff, major, minor)
-#define _MACHINE_VER_IS_EXPIRED5(cutoff, major, minor, micro, _unused, tag)   \
-    _MACHINE_VER_IS_EXPIRED_IMPL(cutoff, major, minor)
-
-#define _MACHINE_IS_EXPIRED(cutoff, ...) \
-+    "old machine version is subject to deletion during current major Proxmox VE release"
-+
-+#define _MACHINE_VER_IS_EXPIRED_IMPL(baseline_major, baseline_minor, major, minor) \
-+    ((major < baseline_major) || \
-+     ((major == baseline_major) && \
-+      (minor < baseline_minor)))
-+
-+#define _MACHINE_VER_IS_EXPIRED2(baseline_major, baseline_minor, major, minor) \
-+    _MACHINE_VER_IS_EXPIRED_IMPL(baseline_major, baseline_minor, major, minor)
-+#define _MACHINE_VER_IS_EXPIRED3(baseline_major, baseline_minor, major, minor, micro) \
-+    _MACHINE_VER_IS_EXPIRED_IMPL(baseline_major, baseline_minor, major, minor)
-+#define _MACHINE_VER_IS_EXPIRED4(baseline_major, baseline_minor, major, minor, _unused, tag) \
-+    _MACHINE_VER_IS_EXPIRED_IMPL(baseline_major, baseline_minor, major, minor)
-+#define _MACHINE_VER_IS_EXPIRED5(baseline_major, baseline_minor, major, minor, micro, _unused, tag)   \
-+    _MACHINE_VER_IS_EXPIRED_IMPL(baseline_major, baseline_minor, major, minor)
-+
-+#define _MACHINE_IS_EXPIRED(baseline_major, baseline_minor, ...) \
-     _MACHINE_VER_PICK(__VA_ARGS__, \
-                       _MACHINE_VER_IS_EXPIRED5, \
-                       _MACHINE_VER_IS_EXPIRED4, \
-                       _MACHINE_VER_IS_EXPIRED3, \
-                      _MACHINE_VER_IS_EXPIRED2) (cutoff, __VA_ARGS__)
-+                      _MACHINE_VER_IS_EXPIRED2) (baseline_major, baseline_minor, __VA_ARGS__)
- 
- /*
-  * Evaluates true when a machine type with (major, minor)
-@@ -675,7 +699,7 @@ struct MachineState {
-  * lifecycle rules
-  */
- #define MACHINE_VER_IS_DEPRECATED(...) \
-    _MACHINE_IS_EXPIRED(MACHINE_VER_DEPRECATION_MAJOR, __VA_ARGS__)
-+    _MACHINE_IS_EXPIRED(MACHINE_VER_BASELINE_PVE_MAJOR, MACHINE_VER_BASELINE_PVE_MINOR, __VA_ARGS__)
- 
- /*
-  * Evaluates true when a machine type with (major, minor)
-@@ -684,7 +708,7 @@ struct MachineState {
-  * lifecycle rules
-  */
- #define MACHINE_VER_SHOULD_DELETE(...) \
-    _MACHINE_IS_EXPIRED(MACHINE_VER_DELETION_MAJOR, __VA_ARGS__)
-+    _MACHINE_IS_EXPIRED(MACHINE_VER_DELETION_MAJOR, MACHINE_VER_DELETION_MINOR, __VA_ARGS__)
- 
- /*
-  * Sets the deprecation reason for a versioned machine based
--- a/debian/patches/pve/0051-Revert-hpet-avoid-timer-storms-on-periodic-timers.patch
+++ b/debian/patches/pve/0051-Revert-hpet-avoid-timer-storms-on-periodic-timers.patch
@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 19 Mar 2025 17:31:05 +0100
-Subject: [PATCH] Revert "hpet: avoid timer storms on periodic timers"
-
-This reverts commit 7c912ffb59e8137091894d767433e65c3df8b0bf.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/timer/hpet.c | 13 ++-----------
- 1 file changed, 2 insertions(+), 11 deletions(-)
-
-diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
-index 5399f1b2a3..8ccc421cbb 100644
--- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -59,7 +59,6 @@ typedef struct HPETTimer {  /* timers */
-     uint8_t wrap_flag;      /* timer pop will indicate wrap for one-shot 32-bit
-                              * mode. Next pop will be actual timer expiration.
-                              */
-    uint64_t last;          /* last value armed, to avoid timer storms */
- } HPETTimer;
- 
- struct HPETState {
-@@ -267,7 +266,6 @@ static int hpet_post_load(void *opaque, int version_id)
-     for (i = 0; i < s->num_timers; i++) {
-         HPETTimer *t = &s->timer[i];
-         t->cmp64 = hpet_calculate_cmp64(t, s->hpet_counter, t->cmp);
-        t->last = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - NANOSECONDS_PER_SECOND;
-     }
-     /* Recalculate the offset between the main counter and guest time */
-     if (!s->hpet_offset_saved) {
-@@ -366,15 +364,8 @@ static const VMStateDescription vmstate_hpet = {
- 
- static void hpet_arm(HPETTimer *t, uint64_t tick)
- {
-    uint64_t ns = hpet_get_ns(t->state, tick);
-
-    /* Clamp period to reasonable min value (1 us) */
-    if (timer_is_periodic(t) && ns - t->last < 1000) {
-        ns = t->last + 1000;
-    }
-
-    t->last = ns;
-    timer_mod(t->qemu_timer, ns);
-+    /* FIXME: Clamp period to reasonable min value? */
-+    timer_mod(t->qemu_timer, hpet_get_ns(t->state, tick));
- }
- 
- /*
--- a/debian/patches/pve/0052-Revert-hpet-store-full-64-bit-target-value-of-the-co.patch
+++ b/debian/patches/pve/0052-Revert-hpet-store-full-64-bit-target-value-of-the-co.patch
@@ -1,203 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 19 Mar 2025 17:31:08 +0100
-Subject: [PATCH] Revert "hpet: store full 64-bit target value of the counter"
-
-This reverts commit 242d665396407f83a6acbffc804882eeb21cfdad.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/timer/hpet.c | 111 +++++++++++++++++++++++++++---------------------
- 1 file changed, 62 insertions(+), 49 deletions(-)
-
-diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
-index 8ccc421cbb..415a9433f1 100644
--- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -54,7 +54,6 @@ typedef struct HPETTimer {  /* timers */
-     uint64_t cmp;           /* comparator */
-     uint64_t fsb;           /* FSB route */
-     /* Hidden register state */
-    uint64_t cmp64;         /* comparator (extended to counter width) */
-     uint64_t period;        /* Last value written to comparator */
-     uint8_t wrap_flag;      /* timer pop will indicate wrap for one-shot 32-bit
-                              * mode. Next pop will be actual timer expiration.
-@@ -116,6 +115,11 @@ static uint32_t timer_enabled(HPETTimer *t)
- }
- 
- static uint32_t hpet_time_after(uint64_t a, uint64_t b)
-+{
-+    return ((int32_t)(b - a) < 0);
-+}
-+
-+static uint32_t hpet_time_after64(uint64_t a, uint64_t b)
- {
-     return ((int64_t)(b - a) < 0);
- }
-@@ -152,32 +156,27 @@ static uint64_t hpet_get_ticks(HPETState *s)
-     return ns_to_ticks(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + s->hpet_offset);
- }
- 
-static uint64_t hpet_get_ns(HPETState *s, uint64_t tick)
-{
-    return ticks_to_ns(tick) - s->hpet_offset;
-}
-
- /*
- * calculate next value of the general counter that matches the
- * target (either entirely, or the low 32-bit only depending on
- * the timer mode).
-+ * calculate diff between comparator value and current ticks
-  */
-static uint64_t hpet_calculate_cmp64(HPETTimer *t, uint64_t cur_tick, uint64_t target)
-+static inline uint64_t hpet_calculate_diff(HPETTimer *t, uint64_t current)
- {
-+
-     if (t->config & HPET_TN_32BIT) {
-        uint64_t result = deposit64(cur_tick, 0, 32, target);
-        if (result < cur_tick) {
-            result += 0x100000000ULL;
-        }
-        return result;
-+        uint32_t diff, cmp;
-+
-+        cmp = (uint32_t)t->cmp;
-+        diff = cmp - (uint32_t)current;
-+        diff = (int32_t)diff > 0 ? diff : (uint32_t)1;
-+        return (uint64_t)diff;
-     } else {
-        return target;
-    }
-}
-+        uint64_t diff, cmp;
- 
-static uint64_t hpet_next_wrap(uint64_t cur_tick)
-{
-    return (cur_tick | 0xffffffffU) + 1;
-+        cmp = t->cmp;
-+        diff = cmp - current;
-+        diff = (int64_t)diff > 0 ? diff : (uint64_t)1;
-+        return diff;
-+    }
- }
- 
- static void update_irq(struct HPETTimer *timer, int set)
-@@ -261,12 +260,7 @@ static bool hpet_validate_num_timers(void *opaque, int version_id)
- static int hpet_post_load(void *opaque, int version_id)
- {
-     HPETState *s = opaque;
-    int i;
- 
-    for (i = 0; i < s->num_timers; i++) {
-        HPETTimer *t = &s->timer[i];
-        t->cmp64 = hpet_calculate_cmp64(t, s->hpet_counter, t->cmp);
-    }
-     /* Recalculate the offset between the main counter and guest time */
-     if (!s->hpet_offset_saved) {
-         s->hpet_offset = ticks_to_ns(s->hpet_counter)
-@@ -362,10 +356,14 @@ static const VMStateDescription vmstate_hpet = {
-     }
- };
- 
-static void hpet_arm(HPETTimer *t, uint64_t tick)
-+static void hpet_arm(HPETTimer *t, uint64_t ticks)
- {
-    /* FIXME: Clamp period to reasonable min value? */
-    timer_mod(t->qemu_timer, hpet_get_ns(t->state, tick));
-+    if (ticks < ns_to_ticks(INT64_MAX / 2)) {
-+        timer_mod(t->qemu_timer,
-+                  qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + ticks_to_ns(ticks));
-+    } else {
-+        timer_del(t->qemu_timer);
-+    }
- }
- 
- /*
-@@ -374,44 +372,54 @@ static void hpet_arm(HPETTimer *t, uint64_t tick)
- static void hpet_timer(void *opaque)
- {
-     HPETTimer *t = opaque;
-+    uint64_t diff;
-+
-     uint64_t period = t->period;
-     uint64_t cur_tick = hpet_get_ticks(t->state);
- 
-     if (timer_is_periodic(t) && period != 0) {
-        while (hpet_time_after(cur_tick, t->cmp64)) {
-            t->cmp64 += period;
-        }
-         if (t->config & HPET_TN_32BIT) {
-            t->cmp = (uint32_t)t->cmp64;
-+            while (hpet_time_after(cur_tick, t->cmp)) {
-+                t->cmp = (uint32_t)(t->cmp + t->period);
-+            }
-         } else {
-            t->cmp = t->cmp64;
-+            while (hpet_time_after64(cur_tick, t->cmp)) {
-+                t->cmp += period;
-+            }
-+        }
-+        diff = hpet_calculate_diff(t, cur_tick);
-+        hpet_arm(t, diff);
-+    } else if (t->config & HPET_TN_32BIT && !timer_is_periodic(t)) {
-+        if (t->wrap_flag) {
-+            diff = hpet_calculate_diff(t, cur_tick);
-+            hpet_arm(t, diff);
-+            t->wrap_flag = 0;
-         }
-        hpet_arm(t, t->cmp64);
-    } else if (t->wrap_flag) {
-        t->wrap_flag = 0;
-        hpet_arm(t, t->cmp64);
-     }
-     update_irq(t, 1);
- }
- 
- static void hpet_set_timer(HPETTimer *t)
- {
-+    uint64_t diff;
-+    uint32_t wrap_diff;  /* how many ticks until we wrap? */
-     uint64_t cur_tick = hpet_get_ticks(t->state);
- 
-+    /* whenever new timer is being set up, make sure wrap_flag is 0 */
-     t->wrap_flag = 0;
-    t->cmp64 = hpet_calculate_cmp64(t, cur_tick, t->cmp);
-    if (t->config & HPET_TN_32BIT) {
-
-        /* hpet spec says in one-shot 32-bit mode, generate an interrupt when
-         * counter wraps in addition to an interrupt with comparator match.
-         */
-        if (!timer_is_periodic(t) && t->cmp64 > hpet_next_wrap(cur_tick)) {
-+    diff = hpet_calculate_diff(t, cur_tick);
-+
-+    /* hpet spec says in one-shot 32-bit mode, generate an interrupt when
-+     * counter wraps in addition to an interrupt with comparator match.
-+     */
-+    if (t->config & HPET_TN_32BIT && !timer_is_periodic(t)) {
-+        wrap_diff = 0xffffffff - (uint32_t)cur_tick;
-+        if (wrap_diff < (uint32_t)diff) {
-+            diff = wrap_diff;
-             t->wrap_flag = 1;
-            hpet_arm(t, hpet_next_wrap(cur_tick));
-            return;
-         }
-     }
-    hpet_arm(t, t->cmp64);
-+    hpet_arm(t, diff);
- }
- 
- static void hpet_del_timer(HPETTimer *t)
-@@ -542,7 +550,12 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-                 timer->cmp = deposit64(timer->cmp, shift, len, value);
-             }
-             if (timer_is_periodic(timer)) {
-                timer->period = deposit64(timer->period, shift, len, value);
-+                /*
-+                 * FIXME: Clamp period to reasonable min value?
-+                 * Clamp period to reasonable max value
-+                 */
-+                new_val = deposit64(timer->period, shift, len, value);
-+                timer->period = MIN(new_val, (timer->config & HPET_TN_32BIT ? ~0u : ~0ull) >> 1);
-             }
-             timer->config &= ~HPET_TN_SETVAL;
-             if (hpet_enabled(s)) {
--- a/debian/patches/pve/0053-Revert-hpet-accept-64-bit-reads-and-writes.patch
+++ b/debian/patches/pve/0053-Revert-hpet-accept-64-bit-reads-and-writes.patch
@@ -1,281 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 19 Mar 2025 17:31:09 +0100
-Subject: [PATCH] Revert "hpet: accept 64-bit reads and writes"
-
-This reverts commit c2366567378dd8fb89329816003801f54e30e6f3.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/timer/hpet.c       | 137 +++++++++++++++++++++++++++++-------------
- hw/timer/trace-events |   3 +-
- 2 files changed, 96 insertions(+), 44 deletions(-)
-
-diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
-index 415a9433f1..e1ac877759 100644
--- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -437,7 +437,6 @@ static uint64_t hpet_ram_read(void *opaque, hwaddr addr,
-                               unsigned size)
- {
-     HPETState *s = opaque;
-    int shift = (addr & 4) * 8;
-     uint64_t cur_tick;
- 
-     trace_hpet_ram_read(addr);
-@@ -452,33 +451,52 @@ static uint64_t hpet_ram_read(void *opaque, hwaddr addr,
-             return 0;
-         }
- 
-        switch (addr & 0x18) {
-        case HPET_TN_CFG: // including interrupt capabilities
-            return timer->config >> shift;
-+        switch ((addr - 0x100) % 0x20) {
-+        case HPET_TN_CFG:
-+            return timer->config;
-+        case HPET_TN_CFG + 4: // Interrupt capabilities
-+            return timer->config >> 32;
-         case HPET_TN_CMP: // comparator register
-            return timer->cmp >> shift;
-+            return timer->cmp;
-+        case HPET_TN_CMP + 4:
-+            return timer->cmp >> 32;
-         case HPET_TN_ROUTE:
-            return timer->fsb >> shift;
-+            return timer->fsb;
-+        case HPET_TN_ROUTE + 4:
-+            return timer->fsb >> 32;
-         default:
-             trace_hpet_ram_read_invalid();
-             break;
-         }
-     } else {
-        switch (addr & ~4) {
-        case HPET_ID: // including HPET_PERIOD
-            return s->capability >> shift;
-+        switch (addr) {
-+        case HPET_ID:
-+            return s->capability;
-+        case HPET_PERIOD:
-+            return s->capability >> 32;
-         case HPET_CFG:
-            return s->config >> shift;
-+            return s->config;
-+        case HPET_CFG + 4:
-+            trace_hpet_invalid_hpet_cfg(4);
-+            return 0;
-         case HPET_COUNTER:
-             if (hpet_enabled(s)) {
-                 cur_tick = hpet_get_ticks(s);
-             } else {
-                 cur_tick = s->hpet_counter;
-             }
-            trace_hpet_ram_read_reading_counter(addr & 4, cur_tick);
-            return cur_tick >> shift;
-+            trace_hpet_ram_read_reading_counter(0, cur_tick);
-+            return cur_tick;
-+        case HPET_COUNTER + 4:
-+            if (hpet_enabled(s)) {
-+                cur_tick = hpet_get_ticks(s);
-+            } else {
-+                cur_tick = s->hpet_counter;
-+            }
-+            trace_hpet_ram_read_reading_counter(4, cur_tick);
-+            return cur_tick >> 32;
-         case HPET_STATUS:
-            return s->isr >> shift;
-+            return s->isr;
-         default:
-             trace_hpet_ram_read_invalid();
-             break;
-@@ -492,11 +510,11 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
- {
-     int i;
-     HPETState *s = opaque;
-    int shift = (addr & 4) * 8;
-    int len = MIN(size * 8, 64 - shift);
-     uint64_t old_val, new_val, cleared;
- 
-     trace_hpet_ram_write(addr, value);
-+    old_val = hpet_ram_read(opaque, addr, 4);
-+    new_val = value;
- 
-     /*address range of all TN regs*/
-     if (addr >= 0x100 && addr <= 0x3ff) {
-@@ -508,12 +526,9 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-             trace_hpet_timer_id_out_of_range(timer_id);
-             return;
-         }
-        switch (addr & 0x18) {
-+        switch ((addr - 0x100) % 0x20) {
-         case HPET_TN_CFG:
-            trace_hpet_ram_write_tn_cfg(addr & 4);
-            old_val = timer->config;
-            new_val = deposit64(old_val, shift, len, value);
-            new_val = hpet_fixup_reg(new_val, old_val, HPET_TN_CFG_WRITE_MASK);
-+            trace_hpet_ram_write_tn_cfg();
-             if (deactivating_bit(old_val, new_val, HPET_TN_TYPE_LEVEL)) {
-                 /*
-                  * Do this before changing timer->config; otherwise, if
-@@ -521,7 +536,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-                  */
-                 update_irq(timer, 0);
-             }
-            timer->config = new_val;
-+            new_val = hpet_fixup_reg(new_val, old_val, HPET_TN_CFG_WRITE_MASK);
-+            timer->config = (timer->config & 0xffffffff00000000ULL) | new_val;
-             if (activating_bit(old_val, new_val, HPET_TN_ENABLE)
-                 && (s->isr & (1 << timer_id))) {
-                 update_irq(timer, 1);
-@@ -534,28 +550,56 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-                 hpet_set_timer(timer);
-             }
-             break;
-+        case HPET_TN_CFG + 4: // Interrupt capabilities
-+            trace_hpet_ram_write_invalid_tn_cfg(4);
-+            break;
-         case HPET_TN_CMP: // comparator register
-+            trace_hpet_ram_write_tn_cmp(0);
-             if (timer->config & HPET_TN_32BIT) {
-                /* High 32-bits are zero, leave them untouched.  */
-                if (shift) {
-                    trace_hpet_ram_write_invalid_tn_cmp();
-                    break;
-+                new_val = (uint32_t)new_val;
-+            }
-+            if (!timer_is_periodic(timer)
-+                || (timer->config & HPET_TN_SETVAL)) {
-+                timer->cmp = (timer->cmp & 0xffffffff00000000ULL) | new_val;
-+            }
-+            if (timer_is_periodic(timer)) {
-+                /*
-+                 * FIXME: Clamp period to reasonable min value?
-+                 * Clamp period to reasonable max value
-+                 */
-+                if (timer->config & HPET_TN_32BIT) {
-+                    new_val = MIN(new_val, ~0u >> 1);
-                 }
-                len = 64;
-                value = (uint32_t) value;
-+                timer->period =
-+                    (timer->period & 0xffffffff00000000ULL) | new_val;
-+            }
-+            /*
-+             * FIXME: on a 64-bit write, HPET_TN_SETVAL should apply to the
-+             * high bits part as well.
-+             */
-+            timer->config &= ~HPET_TN_SETVAL;
-+            if (hpet_enabled(s)) {
-+                hpet_set_timer(timer);
-             }
-            trace_hpet_ram_write_tn_cmp(addr & 4);
-+            break;
-+        case HPET_TN_CMP + 4: // comparator register high order
-+            if (timer->config & HPET_TN_32BIT) {
-+                trace_hpet_ram_write_invalid_tn_cmp();
-+                break;
-+            }
-+            trace_hpet_ram_write_tn_cmp(4);
-             if (!timer_is_periodic(timer)
-                 || (timer->config & HPET_TN_SETVAL)) {
-                timer->cmp = deposit64(timer->cmp, shift, len, value);
-+                timer->cmp = (timer->cmp & 0xffffffffULL) | new_val << 32;
-             }
-             if (timer_is_periodic(timer)) {
-                 /*
-                  * FIXME: Clamp period to reasonable min value?
-                  * Clamp period to reasonable max value
-                  */
-                new_val = deposit64(timer->period, shift, len, value);
-                timer->period = MIN(new_val, (timer->config & HPET_TN_32BIT ? ~0u : ~0ull) >> 1);
-+                new_val = MIN(new_val, ~0u >> 1);
-+                timer->period =
-+                    (timer->period & 0xffffffffULL) | new_val << 32;
-             }
-             timer->config &= ~HPET_TN_SETVAL;
-             if (hpet_enabled(s)) {
-@@ -563,7 +607,10 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-             }
-             break;
-         case HPET_TN_ROUTE:
-            timer->fsb = deposit64(timer->fsb, shift, len, value);
-+            timer->fsb = (timer->fsb & 0xffffffff00000000ULL) | new_val;
-+            break;
-+        case HPET_TN_ROUTE + 4:
-+            timer->fsb = (new_val << 32) | (timer->fsb & 0xffffffff);
-             break;
-         default:
-             trace_hpet_ram_write_invalid();
-@@ -571,14 +618,12 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-         }
-         return;
-     } else {
-        switch (addr & ~4) {
-+        switch (addr) {
-         case HPET_ID:
-             return;
-         case HPET_CFG:
-            old_val = s->config;
-            new_val = deposit64(old_val, shift, len, value);
-             new_val = hpet_fixup_reg(new_val, old_val, HPET_CFG_WRITE_MASK);
-            s->config = new_val;
-+            s->config = (s->config & 0xffffffff00000000ULL) | new_val;
-             if (activating_bit(old_val, new_val, HPET_CFG_ENABLE)) {
-                 /* Enable main counter and interrupt generation. */
-                 s->hpet_offset =
-@@ -608,8 +653,10 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-                 qemu_set_irq(s->irqs[RTC_ISA_IRQ], s->rtc_irq_level);
-             }
-             break;
-+        case HPET_CFG + 4:
-+            trace_hpet_invalid_hpet_cfg(4);
-+            break;
-         case HPET_STATUS:
-            new_val = value << shift;
-             cleared = new_val & s->isr;
-             for (i = 0; i < s->num_timers; i++) {
-                 if (cleared & (1 << i)) {
-@@ -621,7 +668,15 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-             if (hpet_enabled(s)) {
-                 trace_hpet_ram_write_counter_write_while_enabled();
-             }
-            s->hpet_counter = deposit64(s->hpet_counter, shift, len, value);
-+            s->hpet_counter =
-+                (s->hpet_counter & 0xffffffff00000000ULL) | value;
-+            trace_hpet_ram_write_counter_written(0, value, s->hpet_counter);
-+            break;
-+        case HPET_COUNTER + 4:
-+            trace_hpet_ram_write_counter_write_while_enabled();
-+            s->hpet_counter =
-+                (s->hpet_counter & 0xffffffffULL) | (((uint64_t)value) << 32);
-+            trace_hpet_ram_write_counter_written(4, value, s->hpet_counter);
-             break;
-         default:
-             trace_hpet_ram_write_invalid();
-@@ -635,11 +690,7 @@ static const MemoryRegionOps hpet_ram_ops = {
-     .write = hpet_ram_write,
-     .valid = {
-         .min_access_size = 4,
-        .max_access_size = 8,
-    },
-    .impl = {
-        .min_access_size = 4,
-        .max_access_size = 8,
-+        .max_access_size = 4,
-     },
-     .endianness = DEVICE_NATIVE_ENDIAN,
- };
-diff --git a/hw/timer/trace-events b/hw/timer/trace-events
-index 5cfc369fba..219747df2f 100644
--- a/hw/timer/trace-events
-+++ b/hw/timer/trace-events
-@@ -114,7 +114,8 @@ hpet_ram_read_reading_counter(uint8_t reg_off, uint64_t cur_tick) "reading count
- hpet_ram_read_invalid(void) "invalid hpet_ram_readl"
- hpet_ram_write(uint64_t addr, uint64_t value) "enter hpet_ram_writel at 0x%" PRIx64 " = 0x%" PRIx64
- hpet_ram_write_timer_id(uint64_t timer_id) "hpet_ram_writel timer_id = 0x%" PRIx64
-hpet_ram_write_tn_cfg(uint8_t reg_off) "hpet_ram_writel HPET_TN_CFG + %" PRIu8
-+hpet_ram_write_tn_cfg(void) "hpet_ram_writel HPET_TN_CFG"
-+hpet_ram_write_invalid_tn_cfg(uint8_t reg_off) "invalid HPET_TN_CFG + %" PRIu8 " write"
- hpet_ram_write_tn_cmp(uint8_t reg_off) "hpet_ram_writel HPET_TN_CMP + %" PRIu8
- hpet_ram_write_invalid_tn_cmp(void) "invalid HPET_TN_CMP + 4 write"
- hpet_ram_write_invalid(void) "invalid hpet_ram_writel"
--- a/debian/patches/pve/0054-Revert-hpet-place-read-only-bits-directly-in-new_val.patch
+++ b/debian/patches/pve/0054-Revert-hpet-place-read-only-bits-directly-in-new_val.patch
@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 19 Mar 2025 17:31:10 +0100
-Subject: [PATCH] Revert "hpet: place read-only bits directly in "new_val""
-
-This reverts commit ba88935b0fac2588b0a739f810b58dfabf7f92c8.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/timer/hpet.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
-index e1ac877759..b12bbaf10d 100644
--- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -510,7 +510,7 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
- {
-     int i;
-     HPETState *s = opaque;
-    uint64_t old_val, new_val, cleared;
-+    uint64_t old_val, new_val, val;
- 
-     trace_hpet_ram_write(addr, value);
-     old_val = hpet_ram_read(opaque, addr, 4);
-@@ -536,12 +536,13 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-                  */
-                 update_irq(timer, 0);
-             }
-            new_val = hpet_fixup_reg(new_val, old_val, HPET_TN_CFG_WRITE_MASK);
-            timer->config = (timer->config & 0xffffffff00000000ULL) | new_val;
-+            val = hpet_fixup_reg(new_val, old_val, HPET_TN_CFG_WRITE_MASK);
-+            timer->config = (timer->config & 0xffffffff00000000ULL) | val;
-             if (activating_bit(old_val, new_val, HPET_TN_ENABLE)
-                 && (s->isr & (1 << timer_id))) {
-                 update_irq(timer, 1);
-             }
-+
-             if (new_val & HPET_TN_32BIT) {
-                 timer->cmp = (uint32_t)timer->cmp;
-                 timer->period = (uint32_t)timer->period;
-@@ -622,8 +623,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-         case HPET_ID:
-             return;
-         case HPET_CFG:
-            new_val = hpet_fixup_reg(new_val, old_val, HPET_CFG_WRITE_MASK);
-            s->config = (s->config & 0xffffffff00000000ULL) | new_val;
-+            val = hpet_fixup_reg(new_val, old_val, HPET_CFG_WRITE_MASK);
-+            s->config = (s->config & 0xffffffff00000000ULL) | val;
-             if (activating_bit(old_val, new_val, HPET_CFG_ENABLE)) {
-                 /* Enable main counter and interrupt generation. */
-                 s->hpet_offset =
-@@ -657,9 +658,9 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-             trace_hpet_invalid_hpet_cfg(4);
-             break;
-         case HPET_STATUS:
-            cleared = new_val & s->isr;
-+            val = new_val & s->isr;
-             for (i = 0; i < s->num_timers; i++) {
-                if (cleared & (1 << i)) {
-+                if (val & (1 << i)) {
-                     update_irq(&s->timer[i], 0);
-                 }
-             }
--- a/debian/patches/pve/0055-Revert-hpet-remove-unnecessary-variable-index.patch
+++ b/debian/patches/pve/0055-Revert-hpet-remove-unnecessary-variable-index.patch
@@ -1,68 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 19 Mar 2025 17:31:11 +0100
-Subject: [PATCH] Revert "hpet: remove unnecessary variable "index""
-
-This reverts commit 5895879aca252f4ebb2d1078eaf836c61ec54e9b.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/timer/hpet.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
-index b12bbaf10d..6f83d88516 100644
--- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -437,12 +437,12 @@ static uint64_t hpet_ram_read(void *opaque, hwaddr addr,
-                               unsigned size)
- {
-     HPETState *s = opaque;
-    uint64_t cur_tick;
-+    uint64_t cur_tick, index;
- 
-     trace_hpet_ram_read(addr);
-
-+    index = addr;
-     /*address range of all TN regs*/
-    if (addr >= 0x100 && addr <= 0x3ff) {
-+    if (index >= 0x100 && index <= 0x3ff) {
-         uint8_t timer_id = (addr - 0x100) / 0x20;
-         HPETTimer *timer = &s->timer[timer_id];
- 
-@@ -469,7 +469,7 @@ static uint64_t hpet_ram_read(void *opaque, hwaddr addr,
-             break;
-         }
-     } else {
-        switch (addr) {
-+        switch (index) {
-         case HPET_ID:
-             return s->capability;
-         case HPET_PERIOD:
-@@ -510,14 +510,15 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
- {
-     int i;
-     HPETState *s = opaque;
-    uint64_t old_val, new_val, val;
-+    uint64_t old_val, new_val, val, index;
- 
-     trace_hpet_ram_write(addr, value);
-+    index = addr;
-     old_val = hpet_ram_read(opaque, addr, 4);
-     new_val = value;
- 
-     /*address range of all TN regs*/
-    if (addr >= 0x100 && addr <= 0x3ff) {
-+    if (index >= 0x100 && index <= 0x3ff) {
-         uint8_t timer_id = (addr - 0x100) / 0x20;
-         HPETTimer *timer = &s->timer[timer_id];
- 
-@@ -619,7 +620,7 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-         }
-         return;
-     } else {
-        switch (addr) {
-+        switch (index) {
-         case HPET_ID:
-             return;
-         case HPET_CFG:
--- a/debian/patches/pve/0056-Revert-hpet-ignore-high-bits-of-comparator-in-32-bit.patch
+++ b/debian/patches/pve/0056-Revert-hpet-ignore-high-bits-of-comparator-in-32-bit.patch
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 19 Mar 2025 17:31:12 +0100
-Subject: [PATCH] Revert "hpet: ignore high bits of comparator in 32-bit mode"
-
-This reverts commit 9eb7fad3546a89ee7cf0e90f5b1daccf89725cea.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/timer/hpet.c       | 4 ----
- hw/timer/trace-events | 1 -
- 2 files changed, 5 deletions(-)
-
-diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
-index 6f83d88516..509986c0a9 100644
--- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -585,10 +585,6 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-             }
-             break;
-         case HPET_TN_CMP + 4: // comparator register high order
-            if (timer->config & HPET_TN_32BIT) {
-                trace_hpet_ram_write_invalid_tn_cmp();
-                break;
-            }
-             trace_hpet_ram_write_tn_cmp(4);
-             if (!timer_is_periodic(timer)
-                 || (timer->config & HPET_TN_SETVAL)) {
-diff --git a/hw/timer/trace-events b/hw/timer/trace-events
-index 219747df2f..b86870fb22 100644
--- a/hw/timer/trace-events
-+++ b/hw/timer/trace-events
-@@ -117,7 +117,6 @@ hpet_ram_write_timer_id(uint64_t timer_id) "hpet_ram_writel timer_id = 0x%" PRIx
- hpet_ram_write_tn_cfg(void) "hpet_ram_writel HPET_TN_CFG"
- hpet_ram_write_invalid_tn_cfg(uint8_t reg_off) "invalid HPET_TN_CFG + %" PRIu8 " write"
- hpet_ram_write_tn_cmp(uint8_t reg_off) "hpet_ram_writel HPET_TN_CMP + %" PRIu8
-hpet_ram_write_invalid_tn_cmp(void) "invalid HPET_TN_CMP + 4 write"
- hpet_ram_write_invalid(void) "invalid hpet_ram_writel"
- hpet_ram_write_counter_write_while_enabled(void) "Writing counter while HPET enabled!"
- hpet_ram_write_counter_written(uint8_t reg_off, uint64_t value, uint64_t counter) "HPET counter + %" PRIu8 "written. crt = 0x%" PRIx64 " -> 0x%" PRIx64
--- a/debian/patches/pve/0057-Revert-hpet-fix-and-cleanup-persistence-of-interrupt.patch
+++ b/debian/patches/pve/0057-Revert-hpet-fix-and-cleanup-persistence-of-interrupt.patch
@@ -1,120 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 19 Mar 2025 17:31:13 +0100
-Subject: [PATCH] Revert "hpet: fix and cleanup persistence of interrupt
- status"
-
-This reverts commit f0ccf770789e48b7a73497b465fdc892d28c1339.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/timer/hpet.c | 60 ++++++++++++++++---------------------------------
- 1 file changed, 19 insertions(+), 41 deletions(-)
-
-diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
-index 509986c0a9..402cc960f0 100644
--- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -196,31 +196,21 @@ static void update_irq(struct HPETTimer *timer, int set)
-     }
-     s = timer->state;
-     mask = 1 << timer->tn;
-
-    if (set && (timer->config & HPET_TN_TYPE_LEVEL)) {
-        /*
-         * If HPET_TN_ENABLE bit is 0, "the timer will still operate and
-         * generate appropriate status bits, but will not cause an interrupt"
-         */
-        s->isr |= mask;
-    } else {
-+    if (!set || !timer_enabled(timer) || !hpet_enabled(timer->state)) {
-         s->isr &= ~mask;
-    }
-
-    if (set && timer_enabled(timer) && hpet_enabled(s)) {
-        if (timer_fsb_route(timer)) {
-            address_space_stl_le(&address_space_memory, timer->fsb >> 32,
-                                 timer->fsb & 0xffffffff, MEMTXATTRS_UNSPECIFIED,
-                                 NULL);
-        } else if (timer->config & HPET_TN_TYPE_LEVEL) {
-            qemu_irq_raise(s->irqs[route]);
-        } else {
-            qemu_irq_pulse(s->irqs[route]);
-        }
-    } else {
-         if (!timer_fsb_route(timer)) {
-             qemu_irq_lower(s->irqs[route]);
-         }
-+    } else if (timer_fsb_route(timer)) {
-+        address_space_stl_le(&address_space_memory, timer->fsb >> 32,
-+                             timer->fsb & 0xffffffff, MEMTXATTRS_UNSPECIFIED,
-+                             NULL);
-+    } else if (timer->config & HPET_TN_TYPE_LEVEL) {
-+        s->isr |= mask;
-+        qemu_irq_raise(s->irqs[route]);
-+    } else {
-+        s->isr &= ~mask;
-+        qemu_irq_pulse(s->irqs[route]);
-     }
- }
- 
-@@ -424,13 +414,8 @@ static void hpet_set_timer(HPETTimer *t)
- 
- static void hpet_del_timer(HPETTimer *t)
- {
-    HPETState *s = t->state;
-     timer_del(t->qemu_timer);
-
-    if (s->isr & (1 << t->tn)) {
-        /* For level-triggered interrupt, this leaves ISR set but lowers irq.  */
-        update_irq(t, 1);
-    }
-+    update_irq(t, 0);
- }
- 
- static uint64_t hpet_ram_read(void *opaque, hwaddr addr,
-@@ -530,26 +515,20 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-         switch ((addr - 0x100) % 0x20) {
-         case HPET_TN_CFG:
-             trace_hpet_ram_write_tn_cfg();
-            if (deactivating_bit(old_val, new_val, HPET_TN_TYPE_LEVEL)) {
-                /*
-                 * Do this before changing timer->config; otherwise, if
-                 * HPET_TN_FSB is set, update_irq will not lower the qemu_irq.
-                 */
-+            if (activating_bit(old_val, new_val, HPET_TN_FSB_ENABLE)) {
-                 update_irq(timer, 0);
-             }
-             val = hpet_fixup_reg(new_val, old_val, HPET_TN_CFG_WRITE_MASK);
-             timer->config = (timer->config & 0xffffffff00000000ULL) | val;
-            if (activating_bit(old_val, new_val, HPET_TN_ENABLE)
-                && (s->isr & (1 << timer_id))) {
-                update_irq(timer, 1);
-            }
-
-             if (new_val & HPET_TN_32BIT) {
-                 timer->cmp = (uint32_t)timer->cmp;
-                 timer->period = (uint32_t)timer->period;
-             }
-            if (hpet_enabled(s)) {
-+            if (activating_bit(old_val, new_val, HPET_TN_ENABLE) &&
-+                hpet_enabled(s)) {
-                 hpet_set_timer(timer);
-+            } else if (deactivating_bit(old_val, new_val, HPET_TN_ENABLE)) {
-+                hpet_del_timer(timer);
-             }
-             break;
-         case HPET_TN_CFG + 4: // Interrupt capabilities
-@@ -627,10 +606,9 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-                 s->hpet_offset =
-                     ticks_to_ns(s->hpet_counter) - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
-                 for (i = 0; i < s->num_timers; i++) {
-                    if (timer_enabled(&s->timer[i]) && (s->isr & (1 << i))) {
-                        update_irq(&s->timer[i], 1);
-+                    if ((&s->timer[i])->cmp != ~0ULL) {
-+                        hpet_set_timer(&s->timer[i]);
-                     }
-                    hpet_set_timer(&s->timer[i]);
-                 }
-             } else if (deactivating_bit(old_val, new_val, HPET_CFG_ENABLE)) {
-                 /* Halt main counter and disable interrupt generation. */
--- a/debian/patches/pve/0058-savevm-async-improve-setting-state-of-snapshot-opera.patch
+++ b/debian/patches/pve/0058-savevm-async-improve-setting-state-of-snapshot-opera.patch
@@ -1,81 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Mon, 31 Mar 2025 16:55:02 +0200
-Subject: [PATCH] savevm-async: improve setting state of snapshot operation in
- savevm-end handler
-
-One of the callers of wait_for_close_co() already sets the state to
-SAVE_STATE_DONE before, but that is not fully correct, because at that
-moment, the operation is not fully done. In particular, if closing the
-target later fails, the state would even be set to SAVE_STATE_ERROR
-afterwards. DONE -> ERROR is not a valid state transition. Although,
-it should not matter in practice as long as the relevant QMP commands
-are sequential.
-
-The other caller does not set the state and so there seems to be a
-race that could lead to the state not getting set at all. This is
-because before this commit, the wait_for_close_co() function could
-return early when there is no target file anymore. This can only
-happen when canceling and needs to happen right around the time when
-the snapshot is already finishing and closing the target.
-
-Simply avoid the early return and always set the state within the
-wait_for_close_co() function rather than at the call site.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- migration/savevm-async.c | 33 +++++++++++++++------------------
- 1 file changed, 15 insertions(+), 18 deletions(-)
-
-diff --git a/migration/savevm-async.c b/migration/savevm-async.c
-index 1e79fce9ba..e63dc6d8a3 100644
--- a/migration/savevm-async.c
-+++ b/migration/savevm-async.c
-@@ -450,23 +450,22 @@ static void coroutine_fn wait_for_close_co(void *opaque)
- {
-     int64_t timeout;
- 
-    if (!snap_state.target) {
-        DPRINTF("savevm-end: no target file open\n");
-        return;
-    }
-
-    /* wait until cleanup is done before returning, this ensures that after this
-     * call exits the statefile will be closed and can be removed immediately */
-    DPRINTF("savevm-end: waiting for cleanup\n");
-    timeout = 30L * 1000 * 1000 * 1000;
-    qemu_co_sleep_ns_wakeable(&snap_state.target_close_wait,
-                              QEMU_CLOCK_REALTIME, timeout);
-     if (snap_state.target) {
-        save_snapshot_error("timeout waiting for target file close in "
-                            "qmp_savevm_end");
-        /* we cannot assume the snapshot finished in this case, so leave the
-         * state alone - caller has to figure something out */
-        return;
-+        /* wait until cleanup is done before returning, this ensures that after this
-+         * call exits the statefile will be closed and can be removed immediately */
-+        DPRINTF("savevm-end: waiting for cleanup\n");
-+        timeout = 30L * 1000 * 1000 * 1000;
-+        qemu_co_sleep_ns_wakeable(&snap_state.target_close_wait,
-+                                  QEMU_CLOCK_REALTIME, timeout);
-+        if (snap_state.target) {
-+            save_snapshot_error("timeout waiting for target file close in "
-+                                "qmp_savevm_end");
-+            /* we cannot assume the snapshot finished in this case, so leave the
-+             * state alone - caller has to figure something out */
-+            return;
-+        }
-+    } else {
-+        DPRINTF("savevm-end: no target file open\n");
-     }
- 
-     // File closed and no other error, so ensure next snapshot can be started.
-@@ -497,8 +496,6 @@ void qmp_savevm_end(Error **errp)
-         snap_state.saved_vm_running = false;
-     }
- 
-    snap_state.state = SAVE_STATE_DONE;
-
-     qemu_coroutine_enter(wait_for_close);
- }
- 
--- a/debian/patches/pve/0059-savevm-async-rename-saved_vm_running-to-vm_needs_sta.patch
+++ b/debian/patches/pve/0059-savevm-async-rename-saved_vm_running-to-vm_needs_sta.patch
@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Mon, 31 Mar 2025 16:55:03 +0200
-Subject: [PATCH] savevm-async: rename saved_vm_running to vm_needs_start
-
-This is what the variable actually expresses. Otherwise, setting it
-to false after starting the VM doesn't make sense.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- migration/savevm-async.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/migration/savevm-async.c b/migration/savevm-async.c
-index e63dc6d8a3..1e34c31e8b 100644
--- a/migration/savevm-async.c
-+++ b/migration/savevm-async.c
-@@ -51,7 +51,7 @@ static struct SnapshotState {
-     int state;
-     Error *error;
-     Error *blocker;
-    int saved_vm_running;
-+    int vm_needs_start;
-     QEMUFile *file;
-     int64_t total_time;
-     QEMUBH *finalize_bh;
-@@ -224,9 +224,9 @@ static void process_savevm_finalize(void *opaque)
-         save_snapshot_error("process_savevm_cleanup: invalid state: %d",
-                             snap_state.state);
-     }
-    if (snap_state.saved_vm_running) {
-+    if (snap_state.vm_needs_start) {
-         vm_start();
-        snap_state.saved_vm_running = false;
-+        snap_state.vm_needs_start = false;
-     }
- 
-     DPRINTF("timing: process_savevm_finalize (full) took %ld ms\n",
-@@ -352,7 +352,7 @@ void qmp_savevm_start(const char *statefile, Error **errp)
-     }
- 
-     /* initialize snapshot info */
-    snap_state.saved_vm_running = runstate_is_running();
-+    snap_state.vm_needs_start = runstate_is_running();
-     snap_state.bs_pos = 0;
-     snap_state.total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
-     snap_state.blocker = NULL;
-@@ -440,9 +440,9 @@ restart:
- 
-     save_snapshot_error("setup failed");
- 
-    if (snap_state.saved_vm_running) {
-+    if (snap_state.vm_needs_start) {
-         vm_start();
-        snap_state.saved_vm_running = false;
-+        snap_state.vm_needs_start = false;
-     }
- }
- 
-@@ -491,9 +491,9 @@ void qmp_savevm_end(Error **errp)
-         return;
-     }
- 
-    if (snap_state.saved_vm_running) {
-+    if (snap_state.vm_needs_start) {
-         vm_start();
-        snap_state.saved_vm_running = false;
-+        snap_state.vm_needs_start = false;
-     }
- 
-     qemu_coroutine_enter(wait_for_close);
--- a/debian/patches/pve/0060-savevm-async-improve-runstate-preservation-cleanup-e.patch
+++ b/debian/patches/pve/0060-savevm-async-improve-runstate-preservation-cleanup-e.patch
@@ -1,120 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Mon, 31 Mar 2025 16:55:04 +0200
-Subject: [PATCH] savevm-async: improve runstate preservation, cleanup error
- handling
-
-Determine if VM needs to be started after finishing right before
-actually stopping the VM instead of at the beginning.
-
-In qmp_savevm_start(), the only path stopping the VM returns right
-aftwards, so there is no need for the vm_start() handling after
-errors.
-
-Lastly, improve the code style for checking whether migrate_init()
-failed by explicitly comparing against 0.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-[WB: squashed error handling commits, rename goto branch instead of
-     inlining it]
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
- migration/savevm-async.c | 25 ++++++++++---------------
- 1 file changed, 10 insertions(+), 15 deletions(-)
-
-diff --git a/migration/savevm-async.c b/migration/savevm-async.c
-index 1e34c31e8b..d8d2c80475 100644
--- a/migration/savevm-async.c
-+++ b/migration/savevm-async.c
-@@ -178,6 +178,7 @@ static void process_savevm_finalize(void *opaque)
-      */
-     blk_set_aio_context(snap_state.target, qemu_get_aio_context(), NULL);
- 
-+    snap_state.vm_needs_start = runstate_is_running();
-     ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
-     if (ret < 0) {
-         save_snapshot_error("vm_stop_force_state error %d", ret);
-@@ -352,7 +353,6 @@ void qmp_savevm_start(const char *statefile, Error **errp)
-     }
- 
-     /* initialize snapshot info */
-    snap_state.vm_needs_start = runstate_is_running();
-     snap_state.bs_pos = 0;
-     snap_state.total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
-     snap_state.blocker = NULL;
-@@ -364,13 +364,14 @@ void qmp_savevm_start(const char *statefile, Error **errp)
-     }
- 
-     if (!statefile) {
-+        snap_state.vm_needs_start = runstate_is_running();
-         vm_stop(RUN_STATE_SAVE_VM);
-         snap_state.state = SAVE_STATE_COMPLETED;
-         return;
-     }
- 
-     if (qemu_savevm_state_blocked(errp)) {
-        return;
-+        goto fail;
-     }
- 
-     /* Open the image */
-@@ -380,12 +381,12 @@ void qmp_savevm_start(const char *statefile, Error **errp)
-     snap_state.target = blk_new_open(statefile, NULL, options, bdrv_oflags, &local_err);
-     if (!snap_state.target) {
-         error_setg(errp, "failed to open '%s'", statefile);
-        goto restart;
-+        goto fail;
-     }
-     target_bs = blk_bs(snap_state.target);
-     if (!target_bs) {
-         error_setg(errp, "failed to open '%s' - no block driver state", statefile);
-        goto restart;
-+        goto fail;
-     }
- 
-     QIOChannel *ioc = QIO_CHANNEL(qio_channel_savevm_async_new(snap_state.target,
-@@ -394,7 +395,7 @@ void qmp_savevm_start(const char *statefile, Error **errp)
- 
-     if (!snap_state.file) {
-         error_setg(errp, "failed to open '%s'", statefile);
-        goto restart;
-+        goto fail;
-     }
- 
-     /*
-@@ -402,8 +403,8 @@ void qmp_savevm_start(const char *statefile, Error **errp)
-      * State is cleared in process_savevm_co, but has to be initialized
-      * here (blocking main thread, from QMP) to avoid race conditions.
-      */
-    if (migrate_init(ms, errp)) {
-        return;
-+    if (migrate_init(ms, errp) != 0) {
-+        goto fail;
-     }
-     memset(&mig_stats, 0, sizeof(mig_stats));
-     ms->to_dst_file = snap_state.file;
-@@ -418,7 +419,7 @@ void qmp_savevm_start(const char *statefile, Error **errp)
-     if (ret != 0) {
-         error_setg_errno(errp, -ret, "savevm state setup failed: %s",
-                          local_err ? error_get_pretty(local_err) : "unknown error");
-        return;
-+        goto fail;
-     }
- 
-     /* Async processing from here on out happens in iohandler context, so let
-@@ -436,14 +437,8 @@ void qmp_savevm_start(const char *statefile, Error **errp)
- 
-     return;
- 
-restart:
-
-+fail:
-     save_snapshot_error("setup failed");
-
-    if (snap_state.vm_needs_start) {
-        vm_start();
-        snap_state.vm_needs_start = false;
-    }
- }
- 
- static void coroutine_fn wait_for_close_co(void *opaque)
--- a/debian/patches/pve/0061-savevm-async-use-dedicated-iothread-for-state-file.patch
+++ b/debian/patches/pve/0061-savevm-async-use-dedicated-iothread-for-state-file.patch
@@ -1,185 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Mon, 31 Mar 2025 16:55:06 +0200
-Subject: [PATCH] savevm-async: use dedicated iothread for state file
-
-Having the state file be in the iohandler context means that a
-blk_drain_all() call in the main thread or vCPU thread that happens
-while the snapshot is running will result in a deadlock.
-
-For example, the main thread might be stuck in:
-
-> 0  0x00007300ac9552d6 in __ppoll (fds=0x64bd5a411a50, nfds=2, timeout=<optimized out>, timeout@entry=0x0, sigmask=sigmask@entry=0x0) at ../sysdeps/unix/sysv/linux/ppoll.c:42
-> 1  0x000064bd51af3cad in ppoll (__ss=0x0, __timeout=0x0, __nfds=<optimized out>, __fds=<optimized out>) at /usr/include/x86_64-linux-gnu/bits/poll2.h:64
-> 2  0x000064bd51ad8799 in fdmon_poll_wait (ctx=0x64bd58d968a0, ready_list=0x7ffcfcc15558, timeout=-1) at ../util/fdmon-poll.c:79
-> 3  0x000064bd51ad7c3d in aio_poll (ctx=0x64bd58d968a0, blocking=blocking@entry=true) at ../util/aio-posix.c:671
-> 4  0x000064bd519a0b5d in bdrv_drain_all_begin () at ../block/io.c:531
-> 5  bdrv_drain_all_begin () at ../block/io.c:510
-> 6  0x000064bd519943c4 in blk_drain_all () at ../block/block-backend.c:2085
-> 7  0x000064bd5160fc5a in virtio_scsi_dataplane_stop (vdev=0x64bd5a215190) at ../hw/scsi/virtio-scsi-dataplane.c:213
-> 8  0x000064bd51664e90 in virtio_bus_stop_ioeventfd (bus=0x64bd5a215110) at ../hw/virtio/virtio-bus.c:259
-> 9  0x000064bd5166511b in virtio_bus_stop_ioeventfd (bus=<optimized out>) at ../hw/virtio/virtio-bus.c:251
-> 10 virtio_bus_reset (bus=<optimized out>) at ../hw/virtio/virtio-bus.c:107
-> 11 0x000064bd51667431 in virtio_pci_reset (qdev=<optimized out>) at ../hw/virtio/virtio-pci.c:2296
-...
-> 34 0x000064bd517aa951 in pc_machine_reset (machine=<optimized out>, type=<optimized out>) at ../hw/i386/pc.c:1722
-> 35 0x000064bd516aa4c4 in qemu_system_reset (reason=reason@entry=SHUTDOWN_CAUSE_GUEST_RESET) at ../system/runstate.c:525
-> 36 0x000064bd516aaeb9 in main_loop_should_exit (status=<synthetic pointer>) at ../system/runstate.c:801
-> 37 qemu_main_loop () at ../system/runstate.c:834
-
-which is in block/io.c:
-
-> /* Now poll the in-flight requests */
-> AIO_WAIT_WHILE_UNLOCKED(NULL, bdrv_drain_all_poll());
-
-The working theory is: The deadlock happens because the IO is issued
-from the process_savevm_co() coroutine, which doesn't get scheduled
-again to complete in-flight requests when the main thread is stuck
-there polling. The main thread itself is the one that would need to
-schedule it. In case of a vCPU triggering the VirtIO SCSI dataplane
-stop, which happens during (Linux) boot, the vCPU thread will hold the
-big QEMU lock (BQL) blocking the main thread from making progress
-scheduling the process_savevm_co() coroutine.
-
-This change should also help in general to reduce load on the main
-thread and for it to get stuck on IO, i.e. same benefits as using a
-dedicated IO thread for regular drives. This is particularly
-interesting when the VM state storage is a network storage like NFS.
-
-With some luck, it could also help with bug #6262 [0]. The failure
-there happens while issuing/right after the savevm-start QMP command,
-so the most likely coroutine is the process_savevm_co() that was
-previously scheduled to the iohandler context. Likely someone polls
-the iohandler context and wants to enter the already scheduled
-coroutine leading to the abort():
-> qemu_aio_coroutine_enter: Co-routine was already scheduled in 'aio_co_schedule'
-With a dedicated iothread, there hopefully is no such race.
-
-The comment above querying the pending bytes wrongly talked about the
-"iothread lock", but should've been "iohandler lock". This was even
-renamed to BQL (big QEMU lock) a few releases ago. Even if that was
-not a typo to begin with, there are no AioContext locks anymore.
-
-[0]: https://bugzilla.proxmox.com/show_bug.cgi?id=6262
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-[WB: update to the changed error handling in the previous commit]
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
- migration/savevm-async.c | 42 ++++++++++++++++++++++++++++------------
- 1 file changed, 30 insertions(+), 12 deletions(-)
-
-diff --git a/migration/savevm-async.c b/migration/savevm-async.c
-index d8d2c80475..11ea4c601d 100644
--- a/migration/savevm-async.c
-+++ b/migration/savevm-async.c
-@@ -25,6 +25,7 @@
- #include "qemu/main-loop.h"
- #include "qemu/rcu.h"
- #include "qemu/yank.h"
-+#include "sysemu/iothread.h"
- 
- /* #define DEBUG_SAVEVM_STATE */
- 
-@@ -57,6 +58,7 @@ static struct SnapshotState {
-     QEMUBH *finalize_bh;
-     Coroutine *co;
-     QemuCoSleep target_close_wait;
-+    IOThread *iothread;
- } snap_state;
- 
- static bool savevm_aborted(void)
-@@ -256,16 +258,13 @@ static void coroutine_fn process_savevm_co(void *opaque)
-         uint64_t threshold = 400 * 1000;
- 
-         /*
-         * pending_{estimate,exact} are expected to be called without iothread
-         * lock. Similar to what is done in migration.c, call the exact variant
-         * only once pend_precopy in the estimate is below the threshold.
-+         * Similar to what is done in migration.c, call the exact variant only
-+         * once pend_precopy in the estimate is below the threshold.
-          */
-        bql_unlock();
-         qemu_savevm_state_pending_estimate(&pend_precopy, &pend_postcopy);
-         if (pend_precopy <= threshold) {
-             qemu_savevm_state_pending_exact(&pend_precopy, &pend_postcopy);
-         }
-        bql_lock();
-         pending_size = pend_precopy + pend_postcopy;
- 
-         /*
-@@ -332,11 +331,17 @@ static void coroutine_fn process_savevm_co(void *opaque)
-     qemu_bh_schedule(snap_state.finalize_bh);
- }
- 
-+static void savevm_cleanup_iothread(void) {
-+    if (snap_state.iothread) {
-+        iothread_destroy(snap_state.iothread);
-+        snap_state.iothread = NULL;
-+    }
-+}
-+
- void qmp_savevm_start(const char *statefile, Error **errp)
- {
-     Error *local_err = NULL;
-     MigrationState *ms = migrate_get_current();
-    AioContext *iohandler_ctx = iohandler_get_aio_context();
-     BlockDriverState *target_bs = NULL;
-     int ret = 0;
- 
-@@ -374,6 +379,19 @@ void qmp_savevm_start(const char *statefile, Error **errp)
-         goto fail;
-     }
- 
-+    if (snap_state.iothread) {
-+        /* This is not expected, so warn about it, but no point in re-creating a new iothread. */
-+        warn_report("iothread for snapshot already exists - re-using");
-+    } else {
-+        snap_state.iothread =
-+            iothread_create("__proxmox_savevm_async_iothread__", &local_err);
-+        if (!snap_state.iothread) {
-+            error_setg(errp, "creating iothread failed: %s",
-+                       local_err ? error_get_pretty(local_err) : "unknown error");
-+            goto fail;
-+        }
-+    }
-+
-     /* Open the image */
-     QDict *options = NULL;
-     options = qdict_new();
-@@ -422,22 +440,20 @@ void qmp_savevm_start(const char *statefile, Error **errp)
-         goto fail;
-     }
- 
-    /* Async processing from here on out happens in iohandler context, so let
-     * the target bdrv have its home there.
-     */
-    ret = blk_set_aio_context(snap_state.target, iohandler_ctx, &local_err);
-+    ret = blk_set_aio_context(snap_state.target, snap_state.iothread->ctx, &local_err);
-     if (ret != 0) {
-        warn_report("failed to set iohandler context for VM state target: %s %s",
-+        warn_report("failed to set iothread context for VM state target: %s %s",
-                     local_err ? error_get_pretty(local_err) : "unknown error",
-                     strerror(-ret));
-     }
- 
-     snap_state.co = qemu_coroutine_create(&process_savevm_co, NULL);
-    aio_co_schedule(iohandler_ctx, snap_state.co);
-+    aio_co_schedule(snap_state.iothread->ctx, snap_state.co);
- 
-     return;
- 
- fail:
-+    savevm_cleanup_iothread();
-     save_snapshot_error("setup failed");
- }
- 
-@@ -463,6 +479,8 @@ static void coroutine_fn wait_for_close_co(void *opaque)
-         DPRINTF("savevm-end: no target file open\n");
-     }
- 
-+    savevm_cleanup_iothread();
-+
-     // File closed and no other error, so ensure next snapshot can be started.
-     if (snap_state.state != SAVE_STATE_ERROR) {
-         snap_state.state = SAVE_STATE_DONE;
--- a/debian/patches/pve/0062-savevm-async-treat-failure-to-set-iothread-context-a.patch
+++ b/debian/patches/pve/0062-savevm-async-treat-failure-to-set-iothread-context-a.patch
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Mon, 31 Mar 2025 16:55:07 +0200
-Subject: [PATCH] savevm-async: treat failure to set iothread context as a hard
- failure
-
-This is not expected to ever fail and there might be assumptions about
-having the expected context down the line.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-[WB: update to changed error handling]
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
- migration/savevm-async.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/migration/savevm-async.c b/migration/savevm-async.c
-index 11ea4c601d..f2b10b5519 100644
--- a/migration/savevm-async.c
-+++ b/migration/savevm-async.c
-@@ -442,9 +442,9 @@ void qmp_savevm_start(const char *statefile, Error **errp)
- 
-     ret = blk_set_aio_context(snap_state.target, snap_state.iothread->ctx, &local_err);
-     if (ret != 0) {
-        warn_report("failed to set iothread context for VM state target: %s %s",
-                    local_err ? error_get_pretty(local_err) : "unknown error",
-                    strerror(-ret));
-+        error_setg_errno(errp, -ret, "failed to set iothread context for VM state target: %s",
-+                         local_err ? error_get_pretty(local_err) : "unknown error");
-+        goto fail;
-     }
- 
-     snap_state.co = qemu_coroutine_create(&process_savevm_co, NULL);
--- a/debian/patches/pve/0063-PVE-backup-clean-up-directly-in-setup_snapshot_acces.patch
+++ b/debian/patches/pve/0063-PVE-backup-clean-up-directly-in-setup_snapshot_acces.patch
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Thu, 3 Apr 2025 14:30:41 +0200
-Subject: [PATCH] PVE backup: clean up directly in setup_snapshot_access() when
- it fails
-
-The only thing that might need to be cleaned up after
-setup_snapshot_access() failed is dropping the cbw filter. Do so in
-the single branch it matters inside setup_snapshot_access() itself.
-This avoids the need that callers of setup_snapshot_access() use
-cleanup_snapshot_access() when the call failed.
-
-Suggested-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Reviewed-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
- pve-backup.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/pve-backup.c b/pve-backup.c
-index 32352fb5ec..2408f182bc 100644
--- a/pve-backup.c
-+++ b/pve-backup.c
-@@ -576,6 +576,9 @@ static int setup_snapshot_access(PVEBackupDevInfo *di, Error **errp)
-     di->fleecing.snapshot_access =
-         bdrv_open(NULL, NULL, snapshot_access_opts, BDRV_O_RDWR | BDRV_O_UNMAP, &local_err);
-     if (!di->fleecing.snapshot_access) {
-+        bdrv_cbw_drop(di->fleecing.cbw);
-+        di->fleecing.cbw = NULL;
-+
-         error_setg(errp, "setting up snapshot access for fleecing failed: %s",
-                    local_err ? error_get_pretty(local_err) : "unknown error");
-         return -1;
-@@ -629,7 +632,6 @@ static void create_backup_jobs_bh(void *opaque) {
-                 error_setg(errp, "%s - setting up snapshot access for fleecing failed: %s",
-                            di->device_name,
-                            local_err ? error_get_pretty(local_err) : "unknown error");
-                cleanup_snapshot_access(di);
-                 bdrv_drained_end(di->bs);
-                 break;
-             }
--- a/debian/patches/pve/0064-PVE-backup-factor-out-helper-to-clear-backup-state-s.patch
+++ b/debian/patches/pve/0064-PVE-backup-factor-out-helper-to-clear-backup-state-s.patch
@@ -1,59 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Thu, 3 Apr 2025 14:30:42 +0200
-Subject: [PATCH] PVE backup: factor out helper to clear backup state's bitmap
- list
-
-Suggested-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Reviewed-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
- pve-backup.c | 28 ++++++++++++++++++----------
- 1 file changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/pve-backup.c b/pve-backup.c
-index 2408f182bc..915649b5f9 100644
--- a/pve-backup.c
-+++ b/pve-backup.c
-@@ -811,6 +811,23 @@ err:
-     return di_list;
- }
- 
-+/*
-+ * To be called with the backup_state.stat mutex held.
-+ */
-+static void clear_backup_state_bitmap_list(void) {
-+
-+    if (backup_state.stat.bitmap_list) {
-+        GList *bl = backup_state.stat.bitmap_list;
-+        while (bl) {
-+            g_free(((PBSBitmapInfo *)bl->data)->drive);
-+            g_free(bl->data);
-+            bl = g_list_next(bl);
-+        }
-+        g_list_free(backup_state.stat.bitmap_list);
-+        backup_state.stat.bitmap_list = NULL;
-+    }
-+}
-+
- UuidInfo coroutine_fn *qmp_backup(
-     const char *backup_file,
-     const char *password,
-@@ -898,16 +915,7 @@ UuidInfo coroutine_fn *qmp_backup(
-     backup_state.stat.reused = 0;
- 
-     /* clear previous backup's bitmap_list */
-    if (backup_state.stat.bitmap_list) {
-        GList *bl = backup_state.stat.bitmap_list;
-        while (bl) {
-            g_free(((PBSBitmapInfo *)bl->data)->drive);
-            g_free(bl->data);
-            bl = g_list_next(bl);
-        }
-        g_list_free(backup_state.stat.bitmap_list);
-        backup_state.stat.bitmap_list = NULL;
-    }
-+    clear_backup_state_bitmap_list();
- 
-     if (format == BACKUP_FORMAT_PBS) {
-         if (!password) {
--- a/debian/patches/pve/0065-PVE-backup-factor-out-helper-to-initialize-backup-st.patch
+++ b/debian/patches/pve/0065-PVE-backup-factor-out-helper-to-initialize-backup-st.patch
@@ -1,95 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Thu, 3 Apr 2025 14:30:43 +0200
-Subject: [PATCH] PVE backup: factor out helper to initialize backup state stat
- struct
-
-Suggested-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Reviewed-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
- pve-backup.c | 62 ++++++++++++++++++++++++++++++++--------------------
- 1 file changed, 38 insertions(+), 24 deletions(-)
-
-diff --git a/pve-backup.c b/pve-backup.c
-index 915649b5f9..88a981f81c 100644
--- a/pve-backup.c
-+++ b/pve-backup.c
-@@ -828,6 +828,43 @@ static void clear_backup_state_bitmap_list(void) {
-     }
- }
- 
-+/*
-+ * Initializes most of the backup state 'stat' struct. Note that 'reused' and
-+ * 'bitmap_list' are not changed by this function and need to be handled by
-+ * the caller. In particular, 'reused' needs to be set before calling this
-+ * function.
-+ *
-+ * To be called with the backup_state.stat mutex held.
-+ */
-+static void initialize_backup_state_stat(
-+    const char *backup_file,
-+    uuid_t uuid,
-+    size_t total)
-+{
-+    if (backup_state.stat.error) {
-+        error_free(backup_state.stat.error);
-+        backup_state.stat.error = NULL;
-+    }
-+
-+    backup_state.stat.start_time = time(NULL);
-+    backup_state.stat.end_time = 0;
-+
-+    if (backup_state.stat.backup_file) {
-+        g_free(backup_state.stat.backup_file);
-+    }
-+    backup_state.stat.backup_file = g_strdup(backup_file);
-+
-+    uuid_copy(backup_state.stat.uuid, uuid);
-+    uuid_unparse_lower(uuid, backup_state.stat.uuid_str);
-+
-+    backup_state.stat.total = total;
-+    backup_state.stat.dirty = total - backup_state.stat.reused;
-+    backup_state.stat.transferred = 0;
-+    backup_state.stat.zero_bytes = 0;
-+    backup_state.stat.finishing = false;
-+    backup_state.stat.starting = true;
-+}
-+
- UuidInfo coroutine_fn *qmp_backup(
-     const char *backup_file,
-     const char *password,
-@@ -1070,32 +1107,9 @@ UuidInfo coroutine_fn *qmp_backup(
-         }
-     }
-     /* initialize global backup_state now */
-    /* note: 'reused' and 'bitmap_list' are initialized earlier */
-
-    if (backup_state.stat.error) {
-        error_free(backup_state.stat.error);
-        backup_state.stat.error = NULL;
-    }
-
-    backup_state.stat.start_time = time(NULL);
-    backup_state.stat.end_time = 0;
-
-    if (backup_state.stat.backup_file) {
-        g_free(backup_state.stat.backup_file);
-    }
-    backup_state.stat.backup_file = g_strdup(backup_file);
-
-    uuid_copy(backup_state.stat.uuid, uuid);
-    uuid_unparse_lower(uuid, backup_state.stat.uuid_str);
-+    initialize_backup_state_stat(backup_file, uuid, total);
-     char *uuid_str = g_strdup(backup_state.stat.uuid_str);
- 
-    backup_state.stat.total = total;
-    backup_state.stat.dirty = total - backup_state.stat.reused;
-    backup_state.stat.transferred = 0;
-    backup_state.stat.zero_bytes = 0;
-    backup_state.stat.finishing = false;
-    backup_state.stat.starting = true;
-
-     qemu_mutex_unlock(&backup_state.stat.lock);
- 
-     backup_state.speed = (has_speed && speed > 0) ? speed : 0;
--- a/debian/patches/pve/0066-PVE-backup-add-target-ID-in-backup-state.patch
+++ b/debian/patches/pve/0066-PVE-backup-add-target-ID-in-backup-state.patch
@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Thu, 3 Apr 2025 14:30:44 +0200
-Subject: [PATCH] PVE backup: add target ID in backup state
-
-In preparation for allowing multiple backup providers and potentially
-multiple targets for a given provider. Each backup target can then
-have its own dirty bitmap and there can be additional checks that the
-current backup state is actually associated to the expected target.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Reviewed-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
- pve-backup.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/pve-backup.c b/pve-backup.c
-index 88a981f81c..8789a0667a 100644
--- a/pve-backup.c
-+++ b/pve-backup.c
-@@ -70,6 +70,7 @@ static struct PVEBackupState {
-     JobTxn *txn;
-     CoMutex backup_mutex;
-     CoMutex dump_callback_mutex;
-+    char *target_id;
- } backup_state;
- 
- static void pvebackup_init(void)
-@@ -865,6 +866,16 @@ static void initialize_backup_state_stat(
-     backup_state.stat.starting = true;
- }
- 
-+/*
-+ * To be called with the backup_state mutex held.
-+ */
-+static void backup_state_set_target_id(const char *target_id) {
-+    if (backup_state.target_id) {
-+        g_free(backup_state.target_id);
-+    }
-+    backup_state.target_id = g_strdup(target_id);
-+}
-+
- UuidInfo coroutine_fn *qmp_backup(
-     const char *backup_file,
-     const char *password,
-@@ -904,7 +915,7 @@ UuidInfo coroutine_fn *qmp_backup(
- 
-     if (backup_state.di_list) {
-         error_set(errp, ERROR_CLASS_GENERIC_ERROR,
-                  "previous backup not finished");
-+                  "previous backup for target '%s' not finished", backup_state.target_id);
-         qemu_co_mutex_unlock(&backup_state.backup_mutex);
-         return NULL;
-     }
-@@ -1122,6 +1133,8 @@ UuidInfo coroutine_fn *qmp_backup(
-     backup_state.vmaw = vmaw;
-     backup_state.pbs = pbs;
- 
-+    backup_state_set_target_id("Proxmox");
-+
-     backup_state.di_list = di_list;
- 
-     uuid_info = g_malloc0(sizeof(*uuid_info));
--- a/debian/patches/pve/0067-PVE-backup-get-device-info-allow-caller-to-specify-f.patch
+++ b/debian/patches/pve/0067-PVE-backup-get-device-info-allow-caller-to-specify-f.patch
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Thu, 3 Apr 2025 14:30:45 +0200
-Subject: [PATCH] PVE backup: get device info: allow caller to specify filter
- for which devices use fleecing
-
-For providing snapshot-access to external backup providers, EFI and
-TPM also need an associated fleecing image. The new caller will thus
-need a different filter.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Reviewed-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
- pve-backup.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/pve-backup.c b/pve-backup.c
-index 8789a0667a..755f1abcf1 100644
--- a/pve-backup.c
-+++ b/pve-backup.c
-@@ -719,7 +719,7 @@ static void create_backup_jobs_bh(void *opaque) {
- /*
-  * EFI disk and TPM state are small and it's just not worth setting up fleecing for them.
-  */
-static bool device_uses_fleecing(const char *device_id)
-+static bool fleecing_no_efi_tpm(const char *device_id)
- {
-     return strncmp(device_id, "drive-efidisk", 13) && strncmp(device_id, "drive-tpmstate", 14);
- }
-@@ -731,7 +731,7 @@ static bool device_uses_fleecing(const char *device_id)
-  */
- static GList coroutine_fn GRAPH_RDLOCK *get_device_info(
-     const char *devlist,
-    bool fleecing,
-+    bool (*device_uses_fleecing)(const char*),
-     Error **errp)
- {
-     gchar **devs = NULL;
-@@ -757,7 +757,7 @@ static GList coroutine_fn GRAPH_RDLOCK *get_device_info(
-             di->bs = bs;
-             di->device_name = g_strdup(bdrv_get_device_name(bs));
- 
-            if (fleecing && device_uses_fleecing(*d)) {
-+            if (device_uses_fleecing && device_uses_fleecing(*d)) {
-                 g_autofree gchar *fleecing_devid = g_strconcat(*d, "-fleecing", NULL);
-                 BlockBackend *fleecing_blk = blk_by_name(fleecing_devid);
-                 if (!fleecing_blk) {
-@@ -924,7 +924,8 @@ UuidInfo coroutine_fn *qmp_backup(
-     format = has_format ? format : BACKUP_FORMAT_VMA;
- 
-     bdrv_graph_co_rdlock();
-    di_list = get_device_info(devlist, has_fleecing && fleecing, &local_err);
-+    di_list = get_device_info(devlist, (has_fleecing && fleecing) ? fleecing_no_efi_tpm : NULL,
-+                              &local_err);
-     bdrv_graph_co_rdunlock();
-     if (local_err) {
-         error_propagate(errp, local_err);
--- a/debian/patches/pve/0068-PVE-backup-implement-backup-access-setup-and-teardow.patch
+++ b/debian/patches/pve/0068-PVE-backup-implement-backup-access-setup-and-teardow.patch
@@ -1,495 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Thu, 3 Apr 2025 14:30:46 +0200
-Subject: [PATCH] PVE backup: implement backup access setup and teardown API
- for external providers
-
-For external backup providers, the state of the VM's disk images at
-the time the backup is started is preserved via a snapshot-access
-block node. Old data is moved to the fleecing image when new guest
-writes come in. The snapshot-access block node, as well as the
-associated bitmap in case of incremental backup, will be exported via
-NBD to the external provider. The NBD export will be done by the
-management layer, the missing functionality is setting up and tearing
-down the snapshot-access block nodes, which this patch adds.
-
-It is necessary to also set up fleecing for EFI and TPM disks, so that
-old data can be moved out of the way when a new guest write comes in.
-
-There can only be one regular backup or one active backup access at
-a time, because both require replacing the original block node of the
-drive. Thus the backup state is re-used, and checks are added to
-prohibit regular backup while snapshot access is active and vice
-versa.
-
-The block nodes added by the backup-access-setup QMP call are not
-tracked anywhere else (there is no job they are associated to like for
-regular backup). This requires adding a callback for teardown when
-QEMU exits, i.e. in qemu_cleanup(). Otherwise, there will be an
-assertion failure that the block graph is not empty when QEMU exits
-before the backup-access-teardown QMP command is called.
-
-The code for the qmp_backup_access_setup() was based on the existing
-qmp_backup() routine.
-
-The return value for the setup QMP command contains information about
-the snapshot-access block nodes that can be used by the management
-layer to set up the NBD exports.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Reviewed-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
- pve-backup.c         | 264 ++++++++++++++++++++++++++++++++++++++++++-
- pve-backup.h         |  16 +++
- qapi/block-core.json |  49 ++++++++
- system/runstate.c    |   6 +
- 4 files changed, 329 insertions(+), 6 deletions(-)
- create mode 100644 pve-backup.h
-
-diff --git a/pve-backup.c b/pve-backup.c
-index 755f1abcf1..091b5bd231 100644
--- a/pve-backup.c
-+++ b/pve-backup.c
-@@ -1,4 +1,5 @@
- #include "proxmox-backup-client.h"
-+#include "pve-backup.h"
- #include "vma.h"
- 
- #include "qemu/osdep.h"
-@@ -588,6 +589,36 @@ static int setup_snapshot_access(PVEBackupDevInfo *di, Error **errp)
-     return 0;
- }
- 
-+static void setup_all_snapshot_access_bh(void *opaque)
-+{
-+    assert(!qemu_in_coroutine());
-+
-+    CoCtxData *data = (CoCtxData*)opaque;
-+    Error **errp = (Error**)data->data;
-+
-+    Error *local_err = NULL;
-+
-+    GList *l =  backup_state.di_list;
-+    while (l) {
-+        PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
-+        l = g_list_next(l);
-+
-+        bdrv_drained_begin(di->bs);
-+
-+        if (setup_snapshot_access(di, &local_err) < 0) {
-+            bdrv_drained_end(di->bs);
-+            error_setg(errp, "%s - setting up snapshot access failed: %s", di->device_name,
-+                       local_err ? error_get_pretty(local_err) : "unknown error");
-+            break;
-+        }
-+
-+        bdrv_drained_end(di->bs);
-+    }
-+
-+    /* return */
-+    aio_co_enter(data->ctx, data->co);
-+}
-+
- /*
-  * backup_job_create can *not* be run from a coroutine, so this can't either.
-  * The caller is responsible that backup_mutex is held nonetheless.
-@@ -724,6 +755,11 @@ static bool fleecing_no_efi_tpm(const char *device_id)
-     return strncmp(device_id, "drive-efidisk", 13) && strncmp(device_id, "drive-tpmstate", 14);
- }
- 
-+static bool fleecing_all(const char *device_id)
-+{
-+    return true;
-+}
-+
- /*
-  * Returns a list of device infos, which needs to be freed by the caller. In
-  * case of an error, errp will be set, but the returned value might still be a
-@@ -839,8 +875,9 @@ static void clear_backup_state_bitmap_list(void) {
-  */
- static void initialize_backup_state_stat(
-     const char *backup_file,
-    uuid_t uuid,
-    size_t total)
-+    uuid_t *uuid,
-+    size_t total,
-+    bool starting)
- {
-     if (backup_state.stat.error) {
-         error_free(backup_state.stat.error);
-@@ -855,15 +892,19 @@ static void initialize_backup_state_stat(
-     }
-     backup_state.stat.backup_file = g_strdup(backup_file);
- 
-    uuid_copy(backup_state.stat.uuid, uuid);
-    uuid_unparse_lower(uuid, backup_state.stat.uuid_str);
-+    if (uuid) {
-+        uuid_copy(backup_state.stat.uuid, *uuid);
-+        uuid_unparse_lower(*uuid, backup_state.stat.uuid_str);
-+    } else {
-+        backup_state.stat.uuid_str[0] = '\0';
-+    }
- 
-     backup_state.stat.total = total;
-     backup_state.stat.dirty = total - backup_state.stat.reused;
-     backup_state.stat.transferred = 0;
-     backup_state.stat.zero_bytes = 0;
-     backup_state.stat.finishing = false;
-    backup_state.stat.starting = true;
-+    backup_state.stat.starting = starting;
- }
- 
- /*
-@@ -876,6 +917,216 @@ static void backup_state_set_target_id(const char *target_id) {
-     backup_state.target_id = g_strdup(target_id);
- }
- 
-+BackupAccessInfoList *coroutine_fn qmp_backup_access_setup(
-+    const char *target_id,
-+    const char *devlist,
-+    Error **errp)
-+{
-+    assert(qemu_in_coroutine());
-+
-+    qemu_co_mutex_lock(&backup_state.backup_mutex);
-+
-+    Error *local_err = NULL;
-+    GList *di_list = NULL;
-+    GList *l;
-+
-+    if (backup_state.di_list) {
-+        error_set(errp, ERROR_CLASS_GENERIC_ERROR,
-+                  "previous backup for target '%s' not finished", backup_state.target_id);
-+        qemu_co_mutex_unlock(&backup_state.backup_mutex);
-+        return NULL;
-+    }
-+
-+    bdrv_graph_co_rdlock();
-+    di_list = get_device_info(devlist, fleecing_all, &local_err);
-+    bdrv_graph_co_rdunlock();
-+    if (local_err) {
-+        error_propagate(errp, local_err);
-+        goto err;
-+    }
-+    assert(di_list);
-+
-+    size_t total = 0;
-+
-+    l = di_list;
-+    while (l) {
-+        PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
-+        l = g_list_next(l);
-+
-+        ssize_t size = bdrv_getlength(di->bs);
-+        if (size < 0) {
-+            error_setg_errno(errp, -size, "bdrv_getlength failed");
-+            goto err;
-+        }
-+        di->size = size;
-+        total += size;
-+
-+        di->completed_ret = INT_MAX;
-+    }
-+
-+    qemu_mutex_lock(&backup_state.stat.lock);
-+    backup_state.stat.reused = 0;
-+
-+    /* clear previous backup's bitmap_list */
-+    clear_backup_state_bitmap_list();
-+
-+    /* starting=false, because there is no associated QEMU job */
-+    initialize_backup_state_stat(NULL, NULL, total, false);
-+
-+    qemu_mutex_unlock(&backup_state.stat.lock);
-+
-+    backup_state_set_target_id(target_id);
-+
-+    backup_state.vmaw = NULL;
-+    backup_state.pbs = NULL;
-+
-+    backup_state.di_list = di_list;
-+
-+    /* Run setup_all_snapshot_access_bh outside of coroutine (in BH) but keep
-+    * backup_mutex locked. This is fine, a CoMutex can be held across yield
-+    * points, and we'll release it as soon as the BH reschedules us.
-+    */
-+    CoCtxData waker = {
-+        .co = qemu_coroutine_self(),
-+        .ctx = qemu_get_current_aio_context(),
-+        .data = &local_err,
-+    };
-+    aio_bh_schedule_oneshot(waker.ctx, setup_all_snapshot_access_bh, &waker);
-+    qemu_coroutine_yield();
-+
-+    if (local_err) {
-+        error_propagate(errp, local_err);
-+        goto err;
-+    }
-+
-+    qemu_co_mutex_unlock(&backup_state.backup_mutex);
-+
-+    BackupAccessInfoList *bai_head = NULL, **p_bai_next = &bai_head;
-+
-+    l = di_list;
-+    while (l) {
-+        PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
-+        l = g_list_next(l);
-+
-+        BackupAccessInfoList *info = g_malloc0(sizeof(*info));
-+        info->value = g_malloc0(sizeof(*info->value));
-+        info->value->node_name = g_strdup(bdrv_get_node_name(di->fleecing.snapshot_access));
-+        info->value->device = g_strdup(di->device_name);
-+        info->value->size = di->size;
-+
-+        *p_bai_next = info;
-+        p_bai_next = &info->next;
-+    }
-+
-+    return bai_head;
-+
-+err:
-+
-+    l = di_list;
-+    while (l) {
-+        PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
-+        l = g_list_next(l);
-+
-+        g_free(di->device_name);
-+        di->device_name = NULL;
-+
-+        g_free(di);
-+    }
-+    g_list_free(di_list);
-+    backup_state.di_list = NULL;
-+
-+    qemu_co_mutex_unlock(&backup_state.backup_mutex);
-+    return NULL;
-+}
-+
-+/*
-+ * Caller needs to hold the backup mutex or the BQL.
-+ */
-+void backup_access_teardown(void)
-+{
-+    GList *l = backup_state.di_list;
-+
-+    qemu_mutex_lock(&backup_state.stat.lock);
-+    backup_state.stat.finishing = true;
-+    qemu_mutex_unlock(&backup_state.stat.lock);
-+
-+    while (l) {
-+        PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
-+        l = g_list_next(l);
-+
-+        if (di->fleecing.snapshot_access) {
-+            bdrv_unref(di->fleecing.snapshot_access);
-+            di->fleecing.snapshot_access = NULL;
-+        }
-+        if (di->fleecing.cbw) {
-+            bdrv_cbw_drop(di->fleecing.cbw);
-+            di->fleecing.cbw = NULL;
-+        }
-+
-+        g_free(di->device_name);
-+        di->device_name = NULL;
-+
-+        g_free(di);
-+    }
-+    g_list_free(backup_state.di_list);
-+    backup_state.di_list = NULL;
-+
-+    qemu_mutex_lock(&backup_state.stat.lock);
-+    backup_state.stat.end_time = time(NULL);
-+    backup_state.stat.finishing = false;
-+    qemu_mutex_unlock(&backup_state.stat.lock);
-+}
-+
-+// Not done in a coroutine, because bdrv_co_unref() and cbw_drop() would just spawn BHs anyways.
-+// Caller needs to hold the backup_state.backup_mutex lock
-+static void backup_access_teardown_bh(void *opaque)
-+{
-+    CoCtxData *data = (CoCtxData*)opaque;
-+
-+    backup_access_teardown();
-+
-+    /* return */
-+    aio_co_enter(data->ctx, data->co);
-+}
-+
-+void coroutine_fn qmp_backup_access_teardown(const char *target_id, Error **errp)
-+{
-+    assert(qemu_in_coroutine());
-+
-+    qemu_co_mutex_lock(&backup_state.backup_mutex);
-+
-+    if (!backup_state.target_id) { // nothing to do
-+        qemu_co_mutex_unlock(&backup_state.backup_mutex);
-+        return;
-+    }
-+
-+    /*
-+     * Continue with target_id == NULL, used by the callback registered for qemu_cleanup()
-+     */
-+    if (target_id && strcmp(backup_state.target_id, target_id)) {
-+        error_setg(errp, "cannot teardown backup access - got target %s instead of %s",
-+                   target_id, backup_state.target_id);
-+        qemu_co_mutex_unlock(&backup_state.backup_mutex);
-+        return;
-+    }
-+
-+    if (!strcmp(backup_state.target_id, "Proxmox VE")) {
-+        error_setg(errp, "cannot teardown backup access for PVE - use backup-cancel instead");
-+        qemu_co_mutex_unlock(&backup_state.backup_mutex);
-+        return;
-+    }
-+
-+    CoCtxData waker = {
-+        .co = qemu_coroutine_self(),
-+        .ctx = qemu_get_current_aio_context(),
-+    };
-+    aio_bh_schedule_oneshot(waker.ctx, backup_access_teardown_bh, &waker);
-+    qemu_coroutine_yield();
-+
-+    qemu_co_mutex_unlock(&backup_state.backup_mutex);
-+    return;
-+}
-+
- UuidInfo coroutine_fn *qmp_backup(
-     const char *backup_file,
-     const char *password,
-@@ -1119,7 +1370,7 @@ UuidInfo coroutine_fn *qmp_backup(
-         }
-     }
-     /* initialize global backup_state now */
-    initialize_backup_state_stat(backup_file, uuid, total);
-+    initialize_backup_state_stat(backup_file, &uuid, total, true);
-     char *uuid_str = g_strdup(backup_state.stat.uuid_str);
- 
-     qemu_mutex_unlock(&backup_state.stat.lock);
-@@ -1298,5 +1549,6 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
-     ret->pbs_masterkey = true;
-     ret->backup_max_workers = true;
-     ret->backup_fleecing = true;
-+    ret->backup_access_api = true;
-     return ret;
- }
-diff --git a/pve-backup.h b/pve-backup.h
-new file mode 100644
-index 0000000000..4033bc848f
--- /dev/null
-+++ b/pve-backup.h
-@@ -0,0 +1,16 @@
-+/*
-+ * Bacup code used by Proxmox VE
-+ *
-+ * Copyright (C) Proxmox Server Solutions
-+ *
-+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
-+ * See the COPYING file in the top-level directory.
-+ *
-+ */
-+
-+#ifndef PVE_BACKUP_H
-+#define PVE_BACKUP_H
-+
-+void backup_access_teardown(void);
-+
-+#endif /* PVE_BACKUP_H */
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index c581f1f238..3f092221ce 100644
--- a/qapi/block-core.json
-+++ b/qapi/block-core.json
-@@ -1019,6 +1019,9 @@
- #
- # @pbs-library-version: Running version of libproxmox-backup-qemu0 library.
- #
-+# @backup-access-api: Whether backup access API for external providers is
-+#     supported or not.
-+#
- # @backup-fleecing: Whether backup fleecing is supported or not.
- #
- # @backup-max-workers: Whether the 'max-workers' @BackupPerf setting is
-@@ -1032,6 +1035,7 @@
-             'pbs-dirty-bitmap-migration': 'bool',
-             'pbs-masterkey': 'bool',
-             'pbs-library-version': 'str',
-+            'backup-access-api': 'bool',
-             'backup-fleecing': 'bool',
-             'backup-max-workers': 'bool' } }
- 
-@@ -1098,6 +1102,51 @@
- ##
- { 'command': 'query-pbs-bitmap-info', 'returns': ['PBSBitmapInfo'] }
- 
-+##
-+# @BackupAccessInfo:
-+#
-+# Info associated to a snapshot access for backup.  For more information about
-+# the bitmap see @BackupAccessBitmapMode.
-+#
-+# @node-name: the block node name of the snapshot-access node.
-+#
-+# @device: the device on top of which the snapshot access was created.
-+#
-+# @size: the size of the block device in bytes.
-+#
-+##
-+{ 'struct': 'BackupAccessInfo',
-+  'data': { 'node-name': 'str', 'device': 'str', 'size': 'size' } }
-+
-+##
-+# @backup-access-setup:
-+#
-+# Set up snapshot access to VM drives for an external backup provider.  No other
-+# backup or backup access can be done before tearing down the backup access.
-+#
-+# @target-id: the unique ID of the backup target.
-+#
-+# @devlist: list of block device names (separated by ',', ';' or ':'). By
-+#     default the backup includes all writable block devices.
-+#
-+# Returns: a list of @BackupAccessInfo, one for each device.
-+#
-+##
-+{ 'command': 'backup-access-setup',
-+  'data': { 'target-id': 'str', '*devlist': 'str' },
-+  'returns': [ 'BackupAccessInfo' ], 'coroutine': true }
-+
-+##
-+# @backup-access-teardown:
-+#
-+# Tear down previously setup snapshot access for the same target.
-+#
-+# @target-id: the ID of the backup target.
-+#
-+##
-+{ 'command': 'backup-access-teardown', 'data': { 'target-id': 'str' },
-+  'coroutine': true }
-+
- ##
- # @BlockDeviceTimedStats:
- #
-diff --git a/system/runstate.c b/system/runstate.c
-index c2c9afa905..6f93d7c2fb 100644
--- a/system/runstate.c
-+++ b/system/runstate.c
-@@ -60,6 +60,7 @@
- #include "sysemu/sysemu.h"
- #include "sysemu/tpm.h"
- #include "trace.h"
-+#include "pve-backup.h"
- 
- static NotifierList exit_notifiers =
-     NOTIFIER_LIST_INITIALIZER(exit_notifiers);
-@@ -920,6 +921,11 @@ void qemu_cleanup(int status)
-      * requests happening from here on anyway.
-      */
-     bdrv_drain_all_begin();
-+    /*
-+     * The backup access is set up by a QMP command, but is neither owned by a monitor nor
-+     * associated to a BlockBackend. Need to tear it down manually here.
-+     */
-+    backup_access_teardown();
-     job_cancel_sync_all();
-     bdrv_close_all();
- 
--- a/debian/patches/pve/0069-PVE-backup-factor-out-get_single_device_info-helper.patch
+++ b/debian/patches/pve/0069-PVE-backup-factor-out-get_single_device_info-helper.patch
@@ -1,122 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Thu, 3 Apr 2025 14:30:47 +0200
-Subject: [PATCH] PVE backup: factor out get_single_device_info() helper
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-[WB: free di and di->device_name on error]
-Sigend-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
- pve-backup.c | 90 +++++++++++++++++++++++++++++++---------------------
- 1 file changed, 53 insertions(+), 37 deletions(-)
-
-diff --git a/pve-backup.c b/pve-backup.c
-index 091b5bd231..8b7414f057 100644
--- a/pve-backup.c
-+++ b/pve-backup.c
-@@ -760,6 +760,57 @@ static bool fleecing_all(const char *device_id)
-     return true;
- }
- 
-+static PVEBackupDevInfo coroutine_fn GRAPH_RDLOCK *get_single_device_info(
-+    const char *device,
-+    bool (*device_uses_fleecing)(const char*),
-+    Error **errp)
-+{
-+    BlockBackend *blk = blk_by_name(device);
-+    if (!blk) {
-+        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
-+                  "Device '%s' not found", device);
-+        return NULL;
-+    }
-+    BlockDriverState *bs = blk_bs(blk);
-+    if (!bdrv_co_is_inserted(bs)) {
-+        error_setg(errp, "Device '%s' has no medium", device);
-+        return NULL;
-+    }
-+    PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
-+    di->bs = bs;
-+    di->device_name = g_strdup(bdrv_get_device_name(bs));
-+
-+    if (device_uses_fleecing && device_uses_fleecing(device)) {
-+        g_autofree gchar *fleecing_devid = g_strconcat(device, "-fleecing", NULL);
-+        BlockBackend *fleecing_blk = blk_by_name(fleecing_devid);
-+        if (!fleecing_blk) {
-+            error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
-+                      "Device '%s' not found", fleecing_devid);
-+            goto fail;
-+        }
-+        BlockDriverState *fleecing_bs = blk_bs(fleecing_blk);
-+        if (!bdrv_co_is_inserted(fleecing_bs)) {
-+            error_setg(errp, "Device '%s' has no medium", fleecing_devid);
-+            goto fail;
-+        }
-+        /*
-+         * Fleecing image needs to be the same size to act as a cbw target.
-+         */
-+        if (bs->total_sectors != fleecing_bs->total_sectors) {
-+            error_setg(errp, "Size mismatch for '%s' - sector count %ld != %ld",
-+                       fleecing_devid, fleecing_bs->total_sectors, bs->total_sectors);
-+            goto fail;
-+        }
-+        di->fleecing.bs = fleecing_bs;
-+    }
-+
-+    return di;
-+fail:
-+    g_free(di->device_name);
-+    g_free(di);
-+    return NULL;
-+}
-+
- /*
-  * Returns a list of device infos, which needs to be freed by the caller. In
-  * case of an error, errp will be set, but the returned value might still be a
-@@ -778,45 +829,10 @@ static GList coroutine_fn GRAPH_RDLOCK *get_device_info(
- 
-         gchar **d = devs;
-         while (d && *d) {
-            BlockBackend *blk = blk_by_name(*d);
-            if (!blk) {
-                error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
-                          "Device '%s' not found", *d);
-+            PVEBackupDevInfo *di = get_single_device_info(*d, device_uses_fleecing, errp);
-+            if (!di) {
-                 goto err;
-             }
-            BlockDriverState *bs = blk_bs(blk);
-            if (!bdrv_co_is_inserted(bs)) {
-                error_setg(errp, "Device '%s' has no medium", *d);
-                goto err;
-            }
-            PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
-            di->bs = bs;
-            di->device_name = g_strdup(bdrv_get_device_name(bs));
-
-            if (device_uses_fleecing && device_uses_fleecing(*d)) {
-                g_autofree gchar *fleecing_devid = g_strconcat(*d, "-fleecing", NULL);
-                BlockBackend *fleecing_blk = blk_by_name(fleecing_devid);
-                if (!fleecing_blk) {
-                    error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
-                              "Device '%s' not found", fleecing_devid);
-                    goto err;
-                }
-                BlockDriverState *fleecing_bs = blk_bs(fleecing_blk);
-                if (!bdrv_co_is_inserted(fleecing_bs)) {
-                    error_setg(errp, "Device '%s' has no medium", fleecing_devid);
-                    goto err;
-                }
-                /*
-                 * Fleecing image needs to be the same size to act as a cbw target.
-                 */
-                if (bs->total_sectors != fleecing_bs->total_sectors) {
-                    error_setg(errp, "Size mismatch for '%s' - sector count %ld != %ld",
-                               fleecing_devid, fleecing_bs->total_sectors, bs->total_sectors);
-                    goto err;
-                }
-                di->fleecing.bs = fleecing_bs;
-            }
-
-             di_list = g_list_append(di_list, di);
-             d++;
-         }
--- a/Show More
+++ b/Show More