Add Vitastor support

Makefile

@@ -56,8 +56,9 @@ $(BUILDDIR): submodule
 
 .PHONY: deb kvm
 deb kvm: $(DEBS)
-$(DEBS) &: $(BUILDDIR)
-	cd $(BUILDDIR); dpkg-buildpackage -b -us -uc -j40
+$(DEB_DBG): $(DEB)
+$(DEB): $(BUILDDIR)
+	cd $(BUILDDIR); dpkg-buildpackage -b -us -uc -j32
 	lintian $(DEBS)
 
 sbuild: $(DSC)

debian/changelog

@@ -1,183 +1,8 @@
-pve-qemu-kvm (10.0.2-4+vitastor1) trixie; urgency=medium
+pve-qemu-kvm (9.0.0-2+vitastor1) bookworm; urgency=medium
 
   * Add Vitastor support
 
- -- Vitaliy Filippov <vitalif@yourcmc.ru>  Mon, 25 Aug 2025 19:39:12 +0300
-
-pve-qemu-kvm (10.0.2-4) trixie; urgency=medium
-
-  * savevm-async: reuse migration blocker check for snapshots/hibernation to
-    avoid crashing a VM when on these actions if its configuration does not
-    support them.
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 17 Jul 2025 23:08:46 +0200
-
-pve-qemu-kvm (10.0.2-3) trixie; urgency=medium
-
-  * add backup/zeroinit/track-alloc blockdev patches
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 03 Jul 2025 12:02:03 +0200
-
-pve-qemu-kvm (10.0.2-2) trixie; urgency=medium
-
-  * drop support for accessing Gluster based storage directly due to its
-    effective end of support and maintenance. The last upstream release
-    happened over 2.5 years ago and there's currently no one providing
-    enterprise support or security updates. Further, upstream QEMU will remove
-    the integration in one of the next releases, so use the upcomming PVE 9
-    major release to provide a clean cut.
-    User can either stay on Proxmox VE 8 until its end-of-life (probably end
-    of June 2026), or mount GlusterFS "manually" (e.g., /etc/fstab) and add it
-    as directory storage to Proxmox VE.
-    We recommend moving to other actively maintained storage technology
-    altogether though.
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 25 Jun 2025 19:23:30 +0200
-
-pve-qemu-kvm (10.0.2-1) trixie; urgency=medium
-
-  * update QEMU and downstream patches for 10.0.2 release.
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 17 Jun 2025 08:38:51 +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
-
-pve-qemu-kvm (9.0.2-1) bookworm; urgency=medium
-
-  * update submodule and patches to QEMU 9.0.2. While our version had most
-    stable fixes included already, there are new fixes for VirtIO and VGA
-    display screen blanking (#4786)
-
-  * backport fix for a regression with the LSI-53c895a controller and one for
-    the boot order getting ignored for USB storage
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Jul 2024 18:59:40 +0200
-
-pve-qemu-kvm (9.0.0-6) bookworm; urgency=medium
-
-  * fix a regression in the zeroinit block driver that prevented importing and
-    cloning disks to RBD storages which are not using the krbd setting
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 08 Jul 2024 16:11:15 +0200
-
-pve-qemu-kvm (9.0.0-5) bookworm; urgency=medium
-
-  * backport fix for CVE-2024-4467 to prevent malicious qcow2 image files from
-    already causing bad effects if being queried via 'qemu-img info'. For
-    Proxmox VE, this is an additional safe guard, as currently it directly
-    creates and manages the qcow2 images used by VMs and does not allow
-    unprivileged users to import them
-
-  * fix #4726: code cleanup: avoid superfluous check in vma backup code
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 03 Jul 2024 13:13:35 +0200
-
-pve-qemu-kvm (9.0.0-4) bookworm; urgency=medium
-
-  * fix crash after saving a snapshot without including VM state when a VirtIO
-    block device with iothread is configured.
-
-  * fix edge case in error handling when opening a block device from PBS fails
-
-  * minor code cleanup in backup code
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 01 Jul 2024 11:26:11 +0200
-
-pve-qemu-kvm (9.0.0-3) bookworm; urgency=medium
-
-  * fix crash when doing resize after hotplugging a disk using io_uring
-
-  * fix some minor issues in software CPU emulation (i.e. non-KVM) for ARM and
-    x86(_64)
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 29 May 2024 15:55:44 +0200
+ -- Vitaliy Filippov <vitalif@yourcmc.ru>  Mon, 20 May 2024 19:53:28 +0300
 
 pve-qemu-kvm (9.0.0-2) bookworm; urgency=medium
 

debian/control

@@ -12,6 +12,7 @@ Build-Depends: debhelper-compat (= 13),
                libepoxy-dev,
                libfdt-dev,
                libgbm-dev,
+               libglusterfs-dev (>= 5.2-2),
                libgnutls28-dev,
                libiscsi-dev (>= 1.12.0),
                libjpeg-dev,
@@ -46,6 +47,13 @@ Package: pve-qemu-kvm
 Architecture: any
 Depends: ceph-common (>= 0.48),
          iproute2,
+         libgfapi0 | glusterfs-common (>= 5.6),
+         libgfchangelog0 | glusterfs-common (>= 5.6),
+         libgfdb0 | glusterfs-common (>= 5.6),
+         libgfrpc0 | glusterfs-common (>= 5.6),
+         libgfxdr0 | glusterfs-common (>= 5.6),
+         libglusterfs-dev | glusterfs-common (>= 5.6),
+         libglusterfs0 | glusterfs-common (>= 5.6),
          libiscsi4 (>= 1.12.0) | libiscsi7,
          libjpeg62-turbo,
          libspice-server1 (>= 0.14.0~),

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 a53582f17b..fafca1360e 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 a53582f17b..fafca1360e 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 a53582f17b..fafca1360e 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 a53582f17b..fafca1360e 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 a53582f17b..fafca1360e 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 a53582f17b..fafca1360e 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 a53582f17b..fafca1360e 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 a53582f17b..fafca1360e 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 a53582f17b..fafca1360e 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 a53582f17b..fafca1360e 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 a53582f17b..fafca1360e 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 a53582f17b..fafca1360e 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 a53582f17b..fafca1360e 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 a53582f17b..fafca1360e 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 1d1f27cfff..ec45bbaa52 100644
+index 057601dcf0..8682814a7a 100644
 --- a/blockdev.c
 +++ b/blockdev.c
-@@ -2797,6 +2797,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 1d1f27cfff..ec45bbaa52 100644
                                     BlockMirrorBackingMode backing_mode,
                                     bool zero_target,
                                     bool has_speed, int64_t speed,
-@@ -2815,6 +2818,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 1d1f27cfff..ec45bbaa52 100644
  
      GLOBAL_STATE_CODE();
      GRAPH_RDLOCK_GUARD_MAINLOOP();
-@@ -2869,6 +2873,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 1d1f27cfff..ec45bbaa52 100644
      if (!replaces) {
          /* We want to mirror from @bs, but keep implicit filters on top */
          unfiltered_bs = bdrv_skip_implicit_filters(bs);
-@@ -2910,8 +2937,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 1d1f27cfff..ec45bbaa52 100644
                   on_source_error, on_target_error, unmap, filter_node_name,
                   copy_mode, errp);
  }
-@@ -3055,6 +3082,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 1d1f27cfff..ec45bbaa52 100644
                             backing_mode, zero_target,
                             arg->has_speed, arg->speed,
                             arg->has_granularity, arg->granularity,
-@@ -3074,6 +3103,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 1d1f27cfff..ec45bbaa52 100644
                           bool has_speed, int64_t speed,
                           bool has_granularity, uint32_t granularity,
                           bool has_buf_size, int64_t buf_size,
-@@ -3114,7 +3145,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,
@@ -349,7 +349,7 @@ index 1d1f27cfff..ec45bbaa52 100644
                             has_granularity, granularity,
                             has_buf_size, buf_size,
 diff --git a/include/block/block_int-global-state.h b/include/block/block_int-global-state.h
-index eb2d92a226..f0c642b194 100644
+index d2201e27f4..cc1387ae02 100644
 --- a/include/block/block_int-global-state.h
 +++ b/include/block/block_int-global-state.h
 @@ -158,7 +158,9 @@ void mirror_start(const char *job_id, BlockDriverState *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 b1937780e1..0e5f148d30 100644
+index 746d1694c2..45ab548dfe 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -2182,6 +2182,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 b1937780e1..0e5f148d30 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
-@@ -2224,7 +2233,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 b1937780e1..0e5f148d30 100644
              '*speed': 'int', '*granularity': 'uint32',
              '*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
              '*on-target-error': 'BlockdevOnError',
-@@ -2503,6 +2514,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 b1937780e1..0e5f148d30 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
-@@ -2551,7 +2571,8 @@
+@@ -2544,7 +2564,8 @@
  { 'command': 'blockdev-mirror',
    'data': { '*job-id': 'str', 'device': 'str', 'target': 'str',
              '*replaces': 'str',
@@ -421,7 +421,7 @@ index b1937780e1..0e5f148d30 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 2b358eaaa8..2a149fe021 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)

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 fafca1360e..05e738bcce 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 fafca1360e..05e738bcce 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 fafca1360e..05e738bcce 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 fafca1360e..05e738bcce 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);

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 ec45bbaa52..9fab7ec554 100644
+index 8682814a7a..5b75a085ee 100644
 --- a/blockdev.c
 +++ b/blockdev.c
-@@ -2894,6 +2894,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;
          }

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 05e738bcce..2a2a227f3b 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 05e738bcce..2a2a227f3b 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) {

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 2a2a227f3b..87c0856979 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 2a2a227f3b..87c0856979 100644
  
          if (bitmap_mode != BITMAP_SYNC_MODE_NEVER) {
 diff --git a/blockdev.c b/blockdev.c
-index 9fab7ec554..158ac9314b 100644
+index 5b75a085ee..d27d8c38ec 100644
 --- a/blockdev.c
 +++ b/blockdev.c
-@@ -2873,7 +2873,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;
      }
  

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 5676eb334e..4c452a6aeb 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 5676eb334e..4c452a6aeb 100644
  
  /**
 diff --git a/monitor/monitor.c b/monitor/monitor.c
-index c5a5d30877..07775784d4 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 c5a5d30877..07775784d4 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 2f46cf9e49..f093e256e9 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)
@@ -144,7 +144,7 @@ index 2f46cf9e49..f093e256e9 100644
          monitor_qmp_caps_reset(mon);
          data = qmp_greeting(mon);
 diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
-index e569224eae..eb03782e91 100644
+index f3488afeef..2624eb3470 100644
 --- a/qapi/qmp-dispatch.c
 +++ b/qapi/qmp-dispatch.c
 @@ -117,16 +117,28 @@ typedef struct QmpDispatchBH {
@@ -180,7 +180,7 @@ index e569224eae..eb03782e91 100644
      aio_co_wake(data->co);
  }
  
-@@ -253,6 +265,7 @@ QDict *coroutine_mixed_fn qmp_dispatch(const QmpCommandList *cmds, QObject *requ
+@@ -250,6 +262,7 @@ QDict *coroutine_mixed_fn qmp_dispatch(const QmpCommandList *cmds, QObject *requ
              .ret        = &ret,
              .errp       = &err,
              .co         = qemu_coroutine_self(),
@@ -189,7 +189,7 @@ index e569224eae..eb03782e91 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)
  {
  }

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);

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 b14983ec54..41c543e627 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)

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))

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

debian/patches/extra/0006-virtio-gpu-fix-v2-migration.patch

@@ -0,0 +1,98 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
+Date: Thu, 16 May 2024 12:40:22 +0400
+Subject: [PATCH] virtio-gpu: fix v2 migration
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit dfcf74fa ("virtio-gpu: fix scanout migration post-load") broke
+forward/backward version migration. Versioning of nested VMSD structures
+is not straightforward, as the wire format doesn't have nested
+structures versions. Introduce x-scanout-vmstate-version and a field
+test to save/load appropriately according to the machine version.
+
+Fixes: dfcf74fa ("virtio-gpu: fix scanout migration post-load")
+Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+Signed-off-by: Peter Xu <peterx@redhat.com>
+---
+ hw/core/machine.c              |  1 +
+ hw/display/virtio-gpu.c        | 24 ++++++++++++++++--------
+ include/hw/virtio/virtio-gpu.h |  1 +
+ 3 files changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/hw/core/machine.c b/hw/core/machine.c
+index 37ede0e7d4..d33a37a6f6 100644
+--- a/hw/core/machine.c
++++ b/hw/core/machine.c
+@@ -37,6 +37,7 @@ GlobalProperty hw_compat_8_2[] = {
+     { "migration", "zero-page-detection", "legacy"},
+     { TYPE_VIRTIO_IOMMU_PCI, "granule", "4k" },
+     { TYPE_VIRTIO_IOMMU_PCI, "aw-bits", "64" },
++    { "virtio-gpu-device", "x-scanout-vmstate-version", "1" },
+ };
+ const size_t hw_compat_8_2_len = G_N_ELEMENTS(hw_compat_8_2);
+ 
+diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
+index ae831b6b3e..85323daf99 100644
+--- a/hw/display/virtio-gpu.c
++++ b/hw/display/virtio-gpu.c
+@@ -1166,10 +1166,17 @@ static void virtio_gpu_cursor_bh(void *opaque)
+     virtio_gpu_handle_cursor(&g->parent_obj.parent_obj, g->cursor_vq);
+ }
+ 
++static bool scanout_vmstate_after_v2(void *opaque, int version)
++{
++    struct VirtIOGPUBase *base = container_of(opaque, VirtIOGPUBase, scanout);
++    struct VirtIOGPU *gpu = container_of(base, VirtIOGPU, parent_obj);
++
++    return gpu->scanout_vmstate_version >= 2;
++}
++
+ static const VMStateDescription vmstate_virtio_gpu_scanout = {
+     .name = "virtio-gpu-one-scanout",
+-    .version_id = 2,
+-    .minimum_version_id = 1,
++    .version_id = 1,
+     .fields = (const VMStateField[]) {
+         VMSTATE_UINT32(resource_id, struct virtio_gpu_scanout),
+         VMSTATE_UINT32(width, struct virtio_gpu_scanout),
+@@ -1181,12 +1188,12 @@ static const VMStateDescription vmstate_virtio_gpu_scanout = {
+         VMSTATE_UINT32(cursor.hot_y, struct virtio_gpu_scanout),
+         VMSTATE_UINT32(cursor.pos.x, struct virtio_gpu_scanout),
+         VMSTATE_UINT32(cursor.pos.y, struct virtio_gpu_scanout),
+-        VMSTATE_UINT32_V(fb.format, struct virtio_gpu_scanout, 2),
+-        VMSTATE_UINT32_V(fb.bytes_pp, struct virtio_gpu_scanout, 2),
+-        VMSTATE_UINT32_V(fb.width, struct virtio_gpu_scanout, 2),
+-        VMSTATE_UINT32_V(fb.height, struct virtio_gpu_scanout, 2),
+-        VMSTATE_UINT32_V(fb.stride, struct virtio_gpu_scanout, 2),
+-        VMSTATE_UINT32_V(fb.offset, struct virtio_gpu_scanout, 2),
++        VMSTATE_UINT32_TEST(fb.format, struct virtio_gpu_scanout, scanout_vmstate_after_v2),
++        VMSTATE_UINT32_TEST(fb.bytes_pp, struct virtio_gpu_scanout, scanout_vmstate_after_v2),
++        VMSTATE_UINT32_TEST(fb.width, struct virtio_gpu_scanout, scanout_vmstate_after_v2),
++        VMSTATE_UINT32_TEST(fb.height, struct virtio_gpu_scanout, scanout_vmstate_after_v2),
++        VMSTATE_UINT32_TEST(fb.stride, struct virtio_gpu_scanout, scanout_vmstate_after_v2),
++        VMSTATE_UINT32_TEST(fb.offset, struct virtio_gpu_scanout, scanout_vmstate_after_v2),
+         VMSTATE_END_OF_LIST()
+     },
+ };
+@@ -1659,6 +1666,7 @@ static Property virtio_gpu_properties[] = {
+     DEFINE_PROP_BIT("blob", VirtIOGPU, parent_obj.conf.flags,
+                     VIRTIO_GPU_FLAG_BLOB_ENABLED, false),
+     DEFINE_PROP_SIZE("hostmem", VirtIOGPU, parent_obj.conf.hostmem, 0),
++    DEFINE_PROP_UINT8("x-scanout-vmstate-version", VirtIOGPU, scanout_vmstate_version, 2),
+     DEFINE_PROP_END_OF_LIST(),
+ };
+ 
+diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
+index ed44cdad6b..842315d51d 100644
+--- a/include/hw/virtio/virtio-gpu.h
++++ b/include/hw/virtio/virtio-gpu.h
+@@ -177,6 +177,7 @@ typedef struct VGPUDMABuf {
+ struct VirtIOGPU {
+     VirtIOGPUBase parent_obj;
+ 
++    uint8_t scanout_vmstate_version;
+     uint64_t conf_max_hostmem;
+ 
+     VirtQueue *ctrl_vq;

debian/patches/extra/0007-hw-pflash-fix-block-write-start.patch

@@ -0,0 +1,59 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Thu, 16 May 2024 10:46:34 +0200
+Subject: [PATCH] hw/pflash: fix block write start
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Move the pflash_blk_write_start() call.  We need the offset of the
+first data write, not the offset for the setup (number-of-bytes)
+write.  Without this fix u-boot can do block writes to the first
+flash block only.
+
+While being at it drop a leftover FIXME.
+
+Cc: qemu-stable@nongnu.org
+Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2343
+Fixes: fcc79f2e0955 ("hw/pflash: implement update buffer for block writes")
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+(picked up from https://lists.nongnu.org/archive/html/qemu-stable/2024-05/msg00091.html)
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ hw/block/pflash_cfi01.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
+index 1bda8424b9..c8f1cf5a87 100644
+--- a/hw/block/pflash_cfi01.c
++++ b/hw/block/pflash_cfi01.c
+@@ -518,10 +518,6 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,
+             break;
+         case 0xe8: /* Write to buffer */
+             trace_pflash_write(pfl->name, "write to buffer");
+-            /* FIXME should save @offset, @width for case 1+ */
+-            qemu_log_mask(LOG_UNIMP,
+-                          "%s: Write to buffer emulation is flawed\n",
+-                          __func__);
+             pfl->status |= 0x80; /* Ready! */
+             break;
+         case 0xf0: /* Probe for AMD flash */
+@@ -574,7 +570,6 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,
+             }
+             pfl->counter = value;
+             pfl->wcycle++;
+-            pflash_blk_write_start(pfl, offset);
+             break;
+         case 0x60:
+             if (cmd == 0xd0) {
+@@ -605,6 +600,9 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,
+         switch (pfl->cmd) {
+         case 0xe8: /* Block write */
+             /* FIXME check @offset, @width */
++            if (pfl->blk_offset == -1 && pfl->counter) {
++                pflash_blk_write_start(pfl, offset);
++            }
+             if (!pfl->ro && (pfl->blk_offset != -1)) {
+                 pflash_data_write(pfl, offset, value, width, be);
+             } else {

debian/patches/extra/0008-target-i386-fix-operand-size-for-DATA16-REX.W-POPCNT.patch

@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Thu, 9 May 2024 12:38:10 +0200
+Subject: [PATCH] target/i386: fix operand size for DATA16 REX.W POPCNT
+
+According to the manual, 32-bit vs 64-bit is governed by REX.W
+and REX ignores the 0x66 prefix.  This can be confirmed with this
+program:
+
+    #include <stdio.h>
+    int main()
+    {
+       int x = 0x12340000;
+       int y;
+       asm("popcntl %1, %0" : "=r" (y) : "r" (x)); printf("%x\n", y);
+       asm("mov $-1, %0; .byte 0x66; popcntl %1, %0" : "+r" (y) : "r" (x)); printf("%x\n", y);
+       asm("mov $-1, %0; .byte 0x66; popcntq %q1, %q0" : "+r" (y) : "r" (x)); printf("%x\n", y);
+    }
+
+which prints 5/ffff0000/5 on real hardware and 5/ffff0000/ffff0000
+on QEMU.
+
+Cc: qemu-stable@nongnu.org
+Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
+Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+(cherry picked from commit 41c685dc59bb611096f3bb6a663cfa82e4cba97b)
+[FE: keep mo_64_32 helper which still has other users in 9.0.0]
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ target/i386/tcg/translate.c | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
+index 76a42c679c..b60f3bd642 100644
+--- a/target/i386/tcg/translate.c
++++ b/target/i386/tcg/translate.c
+@@ -6799,12 +6799,7 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
+         modrm = x86_ldub_code(env, s);
+         reg = ((modrm >> 3) & 7) | REX_R(s);
+ 
+-        if (s->prefix & PREFIX_DATA) {
+-            ot = MO_16;
+-        } else {
+-            ot = mo_64_32(dflag);
+-        }
+-
++        ot = dflag;
+         gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0);
+         gen_extu(ot, s->T0);
+         tcg_gen_mov_tl(cpu_cc_src, s->T0);

debian/patches/extra/0009-target-i386-rdpkru-wrpkru-are-no-prefix-instructions.patch

@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Thu, 9 May 2024 15:55:47 +0200
+Subject: [PATCH] target/i386: rdpkru/wrpkru are no-prefix instructions
+
+Reject 0x66/0xf3/0xf2 in front of them.
+
+Cc: qemu-stable@nongnu.org
+Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+(cherry picked from commit 40a3ec7b5ffde500789d016660a171057d6b467c)
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ target/i386/tcg/translate.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
+index b60f3bd642..3e949fe964 100644
+--- a/target/i386/tcg/translate.c
++++ b/target/i386/tcg/translate.c
+@@ -6083,7 +6083,8 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
+             gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 1);
+             break;
+         case 0xee: /* rdpkru */
+-            if (prefixes & PREFIX_LOCK) {
++            if (s->prefix & (PREFIX_LOCK | PREFIX_DATA
++                             | PREFIX_REPZ | PREFIX_REPNZ)) {
+                 goto illegal_op;
+             }
+             tcg_gen_trunc_tl_i32(s->tmp2_i32, cpu_regs[R_ECX]);
+@@ -6091,7 +6092,8 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
+             tcg_gen_extr_i64_tl(cpu_regs[R_EAX], cpu_regs[R_EDX], s->tmp1_i64);
+             break;
+         case 0xef: /* wrpkru */
+-            if (prefixes & PREFIX_LOCK) {
++            if (s->prefix & (PREFIX_LOCK | PREFIX_DATA
++                             | PREFIX_REPZ | PREFIX_REPNZ)) {
+                 goto illegal_op;
+             }
+             tcg_gen_concat_tl_i64(s->tmp1_i64, cpu_regs[R_EAX],

debian/patches/extra/0010-target-i386-fix-feature-dependency-for-WAITPKG.patch

@@ -0,0 +1,33 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Wed, 8 May 2024 11:10:54 +0200
+Subject: [PATCH] target/i386: fix feature dependency for WAITPKG
+
+The VMX feature bit depends on general availability of WAITPKG,
+not the other way round.
+
+Fixes: 33cc88261c3 ("target/i386: add support for VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE", 2023-08-28)
+Cc: qemu-stable@nongnu.org
+Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+(cherry picked from commit fe01af5d47d4cf7fdf90c54d43f784e5068c8d72)
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ target/i386/cpu.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/target/i386/cpu.c b/target/i386/cpu.c
+index 33760a2ee1..e693f8ca9a 100644
+--- a/target/i386/cpu.c
++++ b/target/i386/cpu.c
+@@ -1550,8 +1550,8 @@ static FeatureDep feature_dependencies[] = {
+         .to = { FEAT_SVM,                   ~0ull },
+     },
+     {
+-        .from = { FEAT_VMX_SECONDARY_CTLS,  VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE },
+-        .to = { FEAT_7_0_ECX,               CPUID_7_0_ECX_WAITPKG },
++        .from = { FEAT_7_0_ECX,             CPUID_7_0_ECX_WAITPKG },
++        .to = { FEAT_VMX_SECONDARY_CTLS,    VMX_SECONDARY_EXEC_ENABLE_USER_WAIT_PAUSE },
+     },
+ };
+ 

debian/patches/extra/0011-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 cb159fd078..cb6940fc0e 100644
+--- a/hw/virtio/virtio-pci.c
++++ b/hw/virtio/virtio-pci.c
+@@ -1424,38 +1424,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)
+@@ -1602,8 +1570,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)) {
+@@ -1643,7 +1610,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) {

debian/patches/extra/0012-hw-core-machine-move-compatibility-flags-for-VirtIO-.patch

@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fiona Ebner <f.ebner@proxmox.com>
+Date: Thu, 16 May 2024 15:21:07 +0200
+Subject: [PATCH] hw/core/machine: move compatibility flags for VirtIO-net USO
+ to machine 8.1
+
+Migration from an 8.2 or 9.0 binary to an 8.1 binary with machine
+version 8.1 can fail with:
+
+> kvm: Features 0x1c0010130afffa7 unsupported. Allowed features: 0x10179bfffe7
+> kvm: Failed to load virtio-net:virtio
+> kvm: error while loading state for instance 0x0 of device '0000:00:12.0/virtio-net'
+> kvm: load of migration failed: Operation not permitted
+
+The series
+
+53da8b5a99 virtio-net: Add support for USO features
+9da1684954 virtio-net: Add USO flags to vhost support.
+f03e0cf63b tap: Add check for USO features
+2ab0ec3121 tap: Add USO support to tap device.
+
+only landed in QEMU 8.2, so the compatibility flags should be part of
+machine version 8.1.
+
+Moving the flags unfortunately breaks forward migration with machine
+version 8.1 from a binary without this patch to a binary with this
+patch when the feature is enabled by the guest.
+
+Fixes: 53da8b5a99 ("virtio-net: Add support for USO features")
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ hw/core/machine.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/hw/core/machine.c b/hw/core/machine.c
+index d33a37a6f6..4273de16a0 100644
+--- a/hw/core/machine.c
++++ b/hw/core/machine.c
+@@ -46,15 +46,15 @@ GlobalProperty hw_compat_8_1[] = {
+     { "ramfb", "x-migrate", "off" },
+     { "vfio-pci-nohotplug", "x-ramfb-migrate", "off" },
+     { "igb", "x-pcie-flr-init", "off" },
++    { TYPE_VIRTIO_NET, "host_uso", "off"},
++    { TYPE_VIRTIO_NET, "guest_uso4", "off"},
++    { TYPE_VIRTIO_NET, "guest_uso6", "off"},
+ };
+ const size_t hw_compat_8_1_len = G_N_ELEMENTS(hw_compat_8_1);
+ 
+ GlobalProperty hw_compat_8_0[] = {
+     { "migration", "multifd-flush-after-each-section", "on"},
+     { TYPE_PCI_DEVICE, "x-pcie-ari-nextfn-1", "on" },
+-    { TYPE_VIRTIO_NET, "host_uso", "off"},
+-    { TYPE_VIRTIO_NET, "guest_uso4", "off"},
+-    { TYPE_VIRTIO_NET, "guest_uso6", "off"},
+ };
+ const size_t hw_compat_8_0_len = G_N_ELEMENTS(hw_compat_8_0);
+ 

debian/patches/pve-qemu-9.0-vitastor.patch

@@ -1,7 +1,7 @@
-Index: pve-qemu-kvm-10.0.2/block/meson.build
+Index: pve-qemu-kvm-9.0.0/block/meson.build
 ===================================================================
---- pve-qemu-kvm-10.0.2.orig/block/meson.build
-+++ pve-qemu-kvm-10.0.2/block/meson.build
+--- pve-qemu-kvm-9.0.0.orig/block/meson.build
++++ pve-qemu-kvm-9.0.0/block/meson.build
 @@ -126,6 +126,7 @@ foreach m : [
    [libnfs, 'nfs', files('nfs.c')],
    [libssh, 'ssh', files('ssh.c')],
@@ -10,11 +10,11 @@ Index: pve-qemu-kvm-10.0.2/block/meson.build
  ]
    if m[0].found()
      module_ss = ss.source_set()
-Index: pve-qemu-kvm-10.0.2/meson.build
+Index: pve-qemu-kvm-9.0.0/meson.build
 ===================================================================
---- pve-qemu-kvm-10.0.2.orig/meson.build
-+++ pve-qemu-kvm-10.0.2/meson.build
-@@ -1622,6 +1622,26 @@ if not get_option('rbd').auto() or have_
+--- pve-qemu-kvm-9.0.0.orig/meson.build
++++ pve-qemu-kvm-9.0.0/meson.build
+@@ -1452,6 +1452,26 @@ if not get_option('rbd').auto() or have_
    endif
  endif
  
@@ -41,7 +41,7 @@ Index: pve-qemu-kvm-10.0.2/meson.build
  glusterfs = not_found
  glusterfs_ftruncate_has_stat = false
  glusterfs_iocb_has_stat = false
-@@ -2514,6 +2534,7 @@ endif
+@@ -2254,6 +2274,7 @@ endif
  config_host_data.set('CONFIG_OPENGL', opengl.found())
  config_host_data.set('CONFIG_PLUGIN', get_option('plugins'))
  config_host_data.set('CONFIG_RBD', rbd.found())
@@ -49,7 +49,7 @@ Index: pve-qemu-kvm-10.0.2/meson.build
  config_host_data.set('CONFIG_RDMA', rdma.found())
  config_host_data.set('CONFIG_RELOCATABLE', get_option('relocatable'))
  config_host_data.set('CONFIG_SAFESTACK', get_option('safe_stack'))
-@@ -4812,6 +4833,7 @@ summary_info += {'fdt support':       fd
+@@ -4454,6 +4475,7 @@ summary_info += {'fdt support':       fd
  summary_info += {'libcap-ng support': libcap_ng}
  summary_info += {'bpf support':       libbpf}
  summary_info += {'rbd support':       rbd}
@@ -57,12 +57,12 @@ Index: pve-qemu-kvm-10.0.2/meson.build
  summary_info += {'smartcard support': cacard}
  summary_info += {'U2F support':       u2f}
  summary_info += {'libusb':            libusb}
-Index: pve-qemu-kvm-10.0.2/meson_options.txt
+Index: pve-qemu-kvm-9.0.0/meson_options.txt
 ===================================================================
---- pve-qemu-kvm-10.0.2.orig/meson_options.txt
-+++ pve-qemu-kvm-10.0.2/meson_options.txt
-@@ -202,6 +202,8 @@ option('pvg', type: 'feature', value: 'a
-        description: 'macOS paravirtualized graphics support')
+--- pve-qemu-kvm-9.0.0.orig/meson_options.txt
++++ pve-qemu-kvm-9.0.0/meson_options.txt
+@@ -194,6 +194,8 @@ option('lzo', type : 'feature', value :
+        description: 'lzo compression support')
  option('rbd', type : 'feature', value : 'auto',
         description: 'Ceph block device driver')
 +option('vitastor', type : 'feature', value : 'auto',
@@ -70,11 +70,11 @@ Index: pve-qemu-kvm-10.0.2/meson_options.txt
  option('opengl', type : 'feature', value : 'auto',
         description: 'OpenGL support')
  option('rdma', type : 'feature', value : 'auto',
-Index: pve-qemu-kvm-10.0.2/qapi/block-core.json
+Index: pve-qemu-kvm-9.0.0/qapi/block-core.json
 ===================================================================
---- pve-qemu-kvm-10.0.2.orig/qapi/block-core.json
-+++ pve-qemu-kvm-10.0.2/qapi/block-core.json
-@@ -3599,7 +3599,7 @@
+--- pve-qemu-kvm-9.0.0.orig/qapi/block-core.json
++++ pve-qemu-kvm-9.0.0/qapi/block-core.json
+@@ -3481,7 +3481,7 @@
              'raw', 'rbd',
              { 'name': 'replication', 'if': 'CONFIG_REPLICATION' },
              'pbs',
@@ -83,7 +83,7 @@ Index: pve-qemu-kvm-10.0.2/qapi/block-core.json
              { 'name': 'virtio-blk-vfio-pci', 'if': 'CONFIG_BLKIO' },
              { 'name': 'virtio-blk-vhost-user', 'if': 'CONFIG_BLKIO' },
              { 'name': 'virtio-blk-vhost-vdpa', 'if': 'CONFIG_BLKIO' },
-@@ -4725,6 +4725,28 @@
+@@ -4591,6 +4591,28 @@
              '*server': ['InetSocketAddressBase'] } }
  
  ##
@@ -112,7 +112,7 @@ Index: pve-qemu-kvm-10.0.2/qapi/block-core.json
  # @ReplicationMode:
  #
  # An enumeration of replication modes.
-@@ -5194,6 +5216,7 @@
+@@ -5053,6 +5075,7 @@
        'throttle':   'BlockdevOptionsThrottle',
        'vdi':        'BlockdevOptionsGenericFormat',
        'vhdx':       'BlockdevOptionsGenericFormat',
@@ -120,7 +120,7 @@ Index: pve-qemu-kvm-10.0.2/qapi/block-core.json
        'virtio-blk-vfio-pci':
                      { 'type': 'BlockdevOptionsVirtioBlkVfioPci',
                        'if': 'CONFIG_BLKIO' },
-@@ -5674,6 +5697,20 @@
+@@ -5498,6 +5521,20 @@
              '*encrypt' :        'RbdEncryptionCreateOptions' } }
  
  ##
@@ -141,7 +141,7 @@ Index: pve-qemu-kvm-10.0.2/qapi/block-core.json
  # @BlockdevVmdkSubformat:
  #
  # Subformat options for VMDK images
-@@ -5895,6 +5932,7 @@
+@@ -5719,6 +5753,7 @@
        'ssh':            'BlockdevCreateOptionsSsh',
        'vdi':            'BlockdevCreateOptionsVdi',
        'vhdx':           'BlockdevCreateOptionsVhdx',
@@ -149,20 +149,41 @@ Index: pve-qemu-kvm-10.0.2/qapi/block-core.json
        'vmdk':           'BlockdevCreateOptionsVmdk',
        'vpc':            'BlockdevCreateOptionsVpc'
    } }
-Index: pve-qemu-kvm-10.0.2/scripts/meson-buildoptions.sh
+Index: pve-qemu-kvm-9.0.0/scripts/ci/org.centos/stream/8/x86_64/configure
 ===================================================================
---- pve-qemu-kvm-10.0.2.orig/scripts/meson-buildoptions.sh
-+++ pve-qemu-kvm-10.0.2/scripts/meson-buildoptions.sh
-@@ -175,6 +175,7 @@ meson_options_help() {
+--- pve-qemu-kvm-9.0.0.orig/scripts/ci/org.centos/stream/8/x86_64/configure
++++ pve-qemu-kvm-9.0.0/scripts/ci/org.centos/stream/8/x86_64/configure
+@@ -30,7 +30,7 @@
+ --with-suffix="qemu-kvm" \
+ --firmwarepath=/usr/share/qemu-firmware \
+ --target-list="x86_64-softmmu" \
+---block-drv-rw-whitelist="qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle,gluster" \
++--block-drv-rw-whitelist="qcow2,raw,file,host_device,nbd,iscsi,rbd,vitastor,blkdebug,luks,null-co,nvme,copy-on-read,throttle,gluster" \
+ --audio-drv-list="" \
+ --block-drv-ro-whitelist="vmdk,vhdx,vpc,https,ssh" \
+ --with-coroutine=ucontext \
+@@ -176,6 +176,7 @@
+ --enable-opengl \
+ --enable-pie \
+ --enable-rbd \
++--enable-vitastor \
+ --enable-rdma \
+ --enable-seccomp \
+ --enable-snappy \
+Index: pve-qemu-kvm-9.0.0/scripts/meson-buildoptions.sh
+===================================================================
+--- pve-qemu-kvm-9.0.0.orig/scripts/meson-buildoptions.sh
++++ pve-qemu-kvm-9.0.0/scripts/meson-buildoptions.sh
+@@ -168,6 +168,7 @@ meson_options_help() {
+   printf "%s\n" '  qed             qed image format support'
    printf "%s\n" '  qga-vss         build QGA VSS support (broken with MinGW)'
-   printf "%s\n" '  qpl             Query Processing Library support'
    printf "%s\n" '  rbd             Ceph block device driver'
 +  printf "%s\n" '  vitastor        Vitastor block device driver'
    printf "%s\n" '  rdma            Enable RDMA-based migration'
    printf "%s\n" '  replication     replication support'
-   printf "%s\n" '  rust            Rust support'
-@@ -458,6 +459,8 @@ _meson_option_parse() {
-     --disable-qpl) printf "%s" -Dqpl=disabled ;;
+   printf "%s\n" '  rutabaga-gfx    rutabaga_gfx support'
+@@ -445,6 +446,8 @@ _meson_option_parse() {
+     --disable-qom-cast-debug) printf "%s" -Dqom_cast_debug=false ;;
      --enable-rbd) printf "%s" -Drbd=enabled ;;
      --disable-rbd) printf "%s" -Drbd=disabled ;;
 +    --enable-vitastor) printf "%s" -Dvitastor=enabled ;;
@@ -170,11 +191,11 @@ Index: pve-qemu-kvm-10.0.2/scripts/meson-buildoptions.sh
      --enable-rdma) printf "%s" -Drdma=enabled ;;
      --disable-rdma) printf "%s" -Drdma=disabled ;;
      --enable-relocatable) printf "%s" -Drelocatable=true ;;
-Index: pve-qemu-kvm-10.0.2/block/vitastor.c
+Index: pve-qemu-kvm-9.0.0/block/vitastor.c
 ===================================================================
 --- /dev/null
-+++ pve-qemu-kvm-10.0.2/block/vitastor.c
-@@ -0,0 +1,1233 @@
++++ pve-qemu-kvm-9.0.0/block/vitastor.c
+@@ -0,0 +1,1076 @@
 +// Copyright (c) Vitaliy Filippov, 2019+
 +// License: VNPL-1.1 or GNU GPL-2.0+ (see README.md for details)
 +
@@ -182,6 +203,7 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +
 +#ifdef VITASTOR_SOURCE_TREE
 +#define BUILD_DSO
++#define _GNU_SOURCE
 +#endif
 +#include "qemu/osdep.h"
 +#include "qemu/main-loop.h"
@@ -190,42 +212,28 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +#endif
 +#include "block/block_int.h"
 +#include "qapi/error.h"
++#include "qapi/qmp/qdict.h"
 +#include "qapi/qmp/qerror.h"
++#include "qemu/uri.h"
 +#include "qemu/error-report.h"
 +#include "qemu/module.h"
 +#include "qemu/option.h"
 +
-+#if QEMU_VERSION_MAJOR >= 10
-+#include "qobject/qstring.h"
-+#include "qobject/qdict.h"
-+#include "qobject/qobject.h"
-+#include "qobject/qjson.h"
-+#elif QEMU_VERSION_MAJOR >= 3 || QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR >= 10
++#if QEMU_VERSION_MAJOR >= 3
++#include "qemu/units.h"
++#include "block/qdict.h"
++#include "qemu/cutils.h"
++#elif QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR >= 10
++#include "qemu/cutils.h"
 +#include "qapi/qmp/qstring.h"
-+#include "qapi/qmp/qdict.h"
-+#include "qapi/qmp/qobject.h"
 +#include "qapi/qmp/qjson.h"
 +#else
-+#include "qapi/qmp/qstring.h"
 +#include "qapi/qmp/qint.h"
-+#include "qapi/qmp/qdict.h"
-+#include "qapi/qmp/qobject.h"
-+#include "qapi/qmp/qjson.h"
 +#define qdict_put_int(options, name, num_val) qdict_put_obj(options, name, QOBJECT(qint_from_int(num_val)))
 +#define qdict_put_str(options, name, value) qdict_put_obj(options, name, QOBJECT(qstring_from_str(value)))
 +#define qobject_unref QDECREF
 +#endif
-+
-+// parse_uint_full()
-+#if QEMU_VERSION_MAJOR >= 3 || QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR >= 6
-+#include "qemu/cutils.h"
-+#else
-+#include "qemu-common.h"
-+#endif
-+
-+#if QEMU_VERSION_MAJOR >= 10
-+#include "system/replay.h"
-+#elif QEMU_VERSION_MAJOR == 4 && QEMU_VERSION_MINOR >= 2 || QEMU_VERSION_MAJOR > 4
++#if QEMU_VERSION_MAJOR == 4 && QEMU_VERSION_MINOR >= 2 || QEMU_VERSION_MAJOR > 4
 +#include "sysemu/replay.h"
 +#else
 +#include "sysemu/sysemu.h"
@@ -234,11 +242,11 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +#include "vitastor_c.h"
 +
 +#ifdef VITASTOR_SOURCE_TREE
-+void __attribute__((visibility("default"))) qemu_module_dummy(void)
++void qemu_module_dummy(void)
 +{
 +}
 +
-+void __attribute__((visibility("default"))) DSO_STAMP_FUN(void)
++void DSO_STAMP_FUN(void)
 +{
 +}
 +#endif
@@ -249,14 +257,12 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +{
 +    void *proxy;
 +    int uring_eventfd;
-+    int auto_loop;
 +
 +    void *watch;
 +    char *config_path;
 +    char *etcd_host;
 +    char *etcd_prefix;
 +    char *image;
-+    char *file_mirror_path;
 +    int skip_parents;
 +    uint64_t inode;
 +    uint64_t pool;
@@ -348,19 +354,16 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +// vitastor[:key=value]*
 +// vitastor[:etcd_host=127.0.0.1]:inode=1:pool=1[:rdma_gid_index=3]
 +// vitastor:config_path=/etc/vitastor/vitastor.conf:image=testimg
-+// vitastor://?config_path=/etc/vitastor/vitastor.conf&image=testimg
 +static void vitastor_parse_filename(const char *filename, QDict *options, Error **errp)
 +{
 +    const char *start;
 +    char *p, *buf;
 +
-+    int url_style = strstart(filename, "vitastor://?", &start);
-+    if (!url_style && !strstart(filename, "vitastor:", &start))
++    if (!strstart(filename, "vitastor:", &start))
 +    {
 +        error_setg(errp, "File name must start with 'vitastor:'");
 +        return;
 +    }
-+    char delim = url_style ? '&' : ':';
 +
 +    buf = g_strdup(start);
 +    p = buf;
@@ -380,7 +383,7 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +            if (name[i] == '_')
 +                name[i] = '-';
 +        qemu_vitastor_unescape(name);
-+        value = qemu_vitastor_next_tok(p, delim, &p);
++        value = qemu_vitastor_next_tok(p, ':', &p);
 +        qemu_vitastor_unescape(value);
 +        if (!strcmp(name, "inode") ||
 +            !strcmp(name, "pool") ||
@@ -490,8 +493,7 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +
 +    qemu_mutex_lock(&client->mutex);
 +    vitastor_c_watch_inode(client->proxy, client->image, vitastor_co_generic_cb, task);
-+    if (!client->auto_loop)
-+        vitastor_schedule_uring_handler(client);
++    vitastor_schedule_uring_handler(client);
 +    qemu_mutex_unlock(&client->mutex);
 +
 +    while (!task->complete)
@@ -624,74 +626,6 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +}
 +#endif
 +
-+static void check_config(VitastorClient *client)
-+{
-+    size_t bufsize = 64*1024, maxsize = 1024*1024, done = 0;
-+    ssize_t r = 0;
-+    char *data = NULL;
-+    QObject *obj = NULL;
-+    QDict *qd = NULL;
-+    int fd = open(client->config_path, O_RDONLY);
-+    if (fd < 0)
-+    {
-+        fprintf(stderr, "vitastor: failed to read %s: %s\n", client->config_path, strerror(errno));
-+        return;
-+    }
-+    data = (char*)malloc(bufsize);
-+    if (!data)
-+    {
-+        fprintf(stderr, "vitastor: memory allocation failed\n");
-+        goto end_free;
-+    }
-+    while (1)
-+    {
-+        if (bufsize <= done)
-+        {
-+            if (bufsize >= maxsize)
-+            {
-+                fprintf(stderr, "vitastor: config file exceeds %zu bytes\n", maxsize);
-+                goto end_free;
-+            }
-+            bufsize *= 2;
-+            data = (char*)realloc(data, bufsize);
-+            if (!data)
-+            {
-+                fprintf(stderr, "vitastor: memory allocation failed\n");
-+                goto end_free;
-+            }
-+        }
-+        r = read(fd, data+done, bufsize-done);
-+        if (r < 0)
-+        {
-+            if (errno == EAGAIN || errno == EINTR)
-+                continue;
-+            fprintf(stderr, "vitastor: failed to read %s: %s\n", client->config_path, strerror(errno));
-+            break;
-+        }
-+        if (!r)
-+        {
-+            break;
-+        }
-+        done += r;
-+    }
-+    obj = qobject_from_json(data
-+#if QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR >= 9 || QEMU_VERSION_MAJOR >= 3
-+        , NULL
-+#endif
-+    );
-+    qd = qobject_to(QDict, obj);
-+    if (qd)
-+    {
-+        client->file_mirror_path = g_strdup(qdict_get_try_str(qd, "qemu_file_mirror_path"));
-+    }
-+end_free:
-+    if (obj)
-+        qobject_unref(obj);
-+    if (data)
-+        free(data);
-+    close(fd);
-+}
-+
 +static int vitastor_file_open(BlockDriverState *bs, QDict *options, int flags, Error **errp)
 +{
 +    VitastorRPC task;
@@ -710,15 +644,8 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +    client->rdma_gid_index = qdict_get_try_int(options, "rdma-gid-index", 0);
 +    client->rdma_mtu = qdict_get_try_int(options, "rdma-mtu", 0);
 +    client->ctx = bdrv_get_aio_context(bs);
-+    if (client->config_path && strlen(client->config_path))
-+    {
-+        check_config(client);
-+    }
 +#if defined VITASTOR_C_API_VERSION && VITASTOR_C_API_VERSION >= 2
 +    str_array opt = {};
-+    char version_buffer[32];
-+    memset(version_buffer, ' ', sizeof(version_buffer));
-+    version_buffer[sizeof(version_buffer)-1] = '\0';
 +    strarray_push_kv(&opt, "config_path", qdict_get_try_str(options, "config-path"));
 +    strarray_push_kv(&opt, "etcd_address", qdict_get_try_str(options, "etcd-host"));
 +    strarray_push_kv(&opt, "etcd_prefix", qdict_get_try_str(options, "etcd-prefix"));
@@ -728,9 +655,7 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +    strarray_push_kv(&opt, "rdma_gid_index", qdict_get_try_str(options, "rdma-gid-index"));
 +    strarray_push_kv(&opt, "rdma_mtu", qdict_get_try_str(options, "rdma-mtu"));
 +    strarray_push_kv(&opt, "client_writeback_allowed", (flags & BDRV_O_NOCACHE) ? "0" : "1");
-+    strarray_push_kv(&opt, "__version_check_buffer", version_buffer);
 +    client->proxy = vitastor_c_create_uring_json(opt.items, opt.len);
-+    client->auto_loop = 0;
 +    strarray_free(&opt);
 +    if (client->proxy)
 +    {
@@ -743,12 +668,6 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +            return -1;
 +        }
 +        universal_aio_set_fd_handler(client->ctx, client->uring_eventfd, vitastor_uring_handler, NULL, client);
-+        int vitastor_version[3] = { 0 };
-+        if (sscanf(version_buffer, "%d.%d.%d", &vitastor_version[0], &vitastor_version[1], &vitastor_version[2]) == 3 &&
-+            vitastor_version[0] >= 2)
-+        {
-+            client->auto_loop = 1;
-+        }
 +    }
 +    else
 +    {
@@ -846,22 +765,6 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +static void vitastor_close(BlockDriverState *bs)
 +{
 +    VitastorClient *client = bs->opaque;
-+    if (client->uring_eventfd >= 0)
-+    {
-+        // clear the eventfd handler
-+        universal_aio_set_fd_handler(client->ctx, client->uring_eventfd, NULL, NULL, NULL);
-+        int wait_bh = 0;
-+        qemu_mutex_lock(&client->mutex);
-+        // clear uring_eventfd itself to prevent future scheduling of new B/H
-+        client->uring_eventfd = -1;
-+        wait_bh = client->bh_uring_scheduled;
-+        qemu_mutex_unlock(&client->mutex);
-+        if (wait_bh)
-+        {
-+            // wait until existing scheduled B/H is ran
-+            BDRV_POLL_WHILE(bs, client->bh_uring_scheduled);
-+        }
-+    }
 +    vitastor_c_destroy(client->proxy);
 +    if (client->fds)
 +    {
@@ -882,34 +785,6 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +    client->last_bitmap = NULL;
 +}
 +
-+#if QEMU_VERSION_MAJOR >= 3 || QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR >= 2
-+static void vitastor_refresh_filename(BlockDriverState *bs)
-+{
-+    VitastorClient *client = bs->opaque;
-+    size_t len = 0;
-+    int n = 0;
-+    if (client->image && client->file_mirror_path)
-+    {
-+        len = snprintf(bs->exact_filename, sizeof(bs->exact_filename), "%s%s", client->file_mirror_path, client->image);
-+        return;
-+    }
-+    len = snprintf(bs->exact_filename, sizeof(bs->exact_filename), "vitastor://");
-+    if (len < sizeof(bs->exact_filename))
-+    {
-+        if (client->image)
-+            len += snprintf(bs->exact_filename+len, sizeof(bs->exact_filename)-len, "%cimage=%s", (n++ ? '&' : '?'), client->image);
-+        else
-+            len += snprintf(bs->exact_filename+len, sizeof(bs->exact_filename)-len, "%cpool=%ju&inode=%ju&size=%ju", (n++ ? '&' : '?'), client->pool, client->inode, client->size);
-+    }
-+    if (client->config_path && len < sizeof(bs->exact_filename))
-+        len += snprintf(bs->exact_filename+len, sizeof(bs->exact_filename)-len, "%cconfig_path=%s", (n++ ? '&' : '?'), client->config_path);
-+    if (client->etcd_host && len < sizeof(bs->exact_filename))
-+        len += snprintf(bs->exact_filename+len, sizeof(bs->exact_filename)-len, "%cetcd_host=%s", (n++ ? '&' : '?'), client->etcd_host);
-+    if (client->etcd_prefix && len < sizeof(bs->exact_filename))
-+        len += snprintf(bs->exact_filename+len, sizeof(bs->exact_filename)-len, "%cetcd_prefix=%s", (n++ ? '&' : '?'), client->etcd_prefix);
-+}
-+#endif
-+
 +#if QEMU_VERSION_MAJOR >= 3 || QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR > 2
 +static int vitastor_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz)
 +{
@@ -1073,8 +948,7 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +    uint64_t inode = client->watch ? vitastor_c_inode_get_num(client->watch) : client->inode;
 +    qemu_mutex_lock(&client->mutex);
 +    vitastor_c_read(client->proxy, inode, offset, bytes, iov->iov, iov->niov, vitastor_co_read_cb, &task);
-+    if (!client->auto_loop)
-+        vitastor_schedule_uring_handler(client);
++    vitastor_schedule_uring_handler(client);
 +    qemu_mutex_unlock(&client->mutex);
 +
 +    while (!task.complete)
@@ -1108,8 +982,7 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +    uint64_t inode = client->watch ? vitastor_c_inode_get_num(client->watch) : client->inode;
 +    qemu_mutex_lock(&client->mutex);
 +    vitastor_c_write(client->proxy, inode, offset, bytes, 0, iov->iov, iov->niov, vitastor_co_generic_cb, &task);
-+    if (!client->auto_loop)
-+        vitastor_schedule_uring_handler(client);
++    vitastor_schedule_uring_handler(client);
 +    qemu_mutex_unlock(&client->mutex);
 +
 +    while (!task.complete)
@@ -1189,8 +1062,7 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +        task.bitmap = client->last_bitmap = NULL;
 +        qemu_mutex_lock(&client->mutex);
 +        vitastor_c_read_bitmap(client->proxy, task.inode, task.offset, task.len, !client->skip_parents, vitastor_co_read_bitmap_cb, &task);
-+        if (!client->auto_loop)
-+            vitastor_schedule_uring_handler(client);
++        vitastor_schedule_uring_handler(client);
 +        qemu_mutex_unlock(&client->mutex);
 +        while (!task.complete)
 +        {
@@ -1277,8 +1149,7 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +
 +    qemu_mutex_lock(&client->mutex);
 +    vitastor_c_sync(client->proxy, vitastor_co_generic_cb, &task);
-+    if (!client->auto_loop)
-+        vitastor_schedule_uring_handler(client);
++    vitastor_schedule_uring_handler(client);
 +    qemu_mutex_unlock(&client->mutex);
 +
 +    while (!task.complete)
@@ -1340,9 +1211,6 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +    .bdrv_get_info                  = vitastor_get_info,
 +    .bdrv_getlength                 = vitastor_getlength,
 +#endif
-+#if QEMU_VERSION_MAJOR >= 3 || QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR >= 2
-+    .bdrv_refresh_filename          = vitastor_refresh_filename,
-+#endif
 +#if QEMU_VERSION_MAJOR >= 3 || QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR > 2
 +    .bdrv_probe_blocksizes          = vitastor_probe_blocksizes,
 +#endif
@@ -1351,11 +1219,7 @@ Index: pve-qemu-kvm-10.0.2/block/vitastor.c
 +    // FIXME: Implement it along with per-inode statistics
 +    //.bdrv_get_allocated_file_size   = vitastor_get_allocated_file_size,
 +
-+#if QEMU_VERSION_MAJOR > 9 || QEMU_VERSION_MAJOR == 9 && QEMU_VERSION_MINOR > 0
-+    .bdrv_open                      = vitastor_file_open,
-+#else
 +    .bdrv_file_open                 = vitastor_file_open,
-+#endif
 +    .bdrv_close                     = vitastor_close,
 +
 +    // Option list for the create operation

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 56d1972d15..cfa0b832ba 100644
+index 35684f7e21..43bc0bd520 100644
 --- a/block/file-posix.c
 +++ b/block/file-posix.c
-@@ -565,7 +565,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 56d1972d15..cfa0b832ba 100644
          },
          {
              .name = "pr-manager",
-@@ -665,7 +665,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:

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"

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 76f24446a5..2a47d79b49 100644
+index 6b05738079..d82869900a 100644
 --- a/target/i386/cpu.h
 +++ b/target/i386/cpu.h
-@@ -2556,9 +2556,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

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 0326c63bec..d523d00200 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)

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 c6d25ae733..ccca125c3a 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 c6d25ae733..ccca125c3a 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 c6d25ae733..ccca125c3a 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,
          }
      }
  

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 af984fb7db..bf143fac00 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,

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 ccca125c3a..301a653ea7 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 ccca125c3a..301a653ea7 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 ccca125c3a..301a653ea7 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 ccca125c3a..301a653ea7 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 ccca125c3a..301a653ea7 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 ccca125c3a..301a653ea7 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);

debian/patches/pve/0008-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch

@@ -9,7 +9,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/qemu-img.c b/qemu-img.c
-index 2044c22a4c..4c8b5412c6 100644
+index 7668f86769..2575e97b43 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
 @@ -3075,7 +3075,8 @@ static int img_info(int argc, char **argv)

debian/patches/pve/0009-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch

@@ -54,10 +54,10 @@ index c9dd70a892..048788b23d 100644
  
  DEF("info", img_info,
 diff --git a/qemu-img.c b/qemu-img.c
-index 4c8b5412c6..d5fa89a204 100644
+index 2575e97b43..8ec68b346f 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
-@@ -4997,10 +4997,12 @@ static int img_bitmap(int argc, char **argv)
+@@ -4993,10 +4993,12 @@ static int img_bitmap(int argc, char **argv)
  #define C_IF      04
  #define C_OF      010
  #define C_SKIP    020
@@ -70,7 +70,7 @@ index 4c8b5412c6..d5fa89a204 100644
  };
  
  struct DdIo {
-@@ -5076,6 +5078,19 @@ static int img_dd_skip(const char *arg,
+@@ -5072,6 +5074,19 @@ static int img_dd_skip(const char *arg,
      return 0;
  }
  
@@ -90,7 +90,7 @@ index 4c8b5412c6..d5fa89a204 100644
  static int img_dd(int argc, char **argv)
  {
      int ret = 0;
-@@ -5116,6 +5131,7 @@ static int img_dd(int argc, char **argv)
+@@ -5112,6 +5127,7 @@ static int img_dd(int argc, char **argv)
          { "if", img_dd_if, C_IF },
          { "of", img_dd_of, C_OF },
          { "skip", img_dd_skip, C_SKIP },
@@ -98,7 +98,7 @@ index 4c8b5412c6..d5fa89a204 100644
          { NULL, NULL, 0 }
      };
      const struct option long_options[] = {
-@@ -5191,91 +5207,112 @@ static int img_dd(int argc, char **argv)
+@@ -5187,91 +5203,112 @@ static int img_dd(int argc, char **argv)
          arg = NULL;
      }
  
@@ -275,7 +275,7 @@ index 4c8b5412c6..d5fa89a204 100644
      }
  
      if (dd.flags & C_SKIP && (in.offset > INT64_MAX / in.bsz ||
-@@ -5292,20 +5329,43 @@ static int img_dd(int argc, char **argv)
+@@ -5288,20 +5325,43 @@ static int img_dd(int argc, char **argv)
      in.buf = g_new(uint8_t, in.bsz);
  
      for (out_pos = 0; in_pos < size; ) {

debian/patches/pve/0010-PVE-Up-qemu-img-dd-add-isize-parameter.patch

@@ -16,10 +16,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
  1 file changed, 25 insertions(+), 3 deletions(-)
 
 diff --git a/qemu-img.c b/qemu-img.c
-index d5fa89a204..d458e85af2 100644
+index 8ec68b346f..b98184bba1 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
-@@ -4998,11 +4998,13 @@ static int img_bitmap(int argc, char **argv)
+@@ -4994,11 +4994,13 @@ static int img_bitmap(int argc, char **argv)
  #define C_OF      010
  #define C_SKIP    020
  #define C_OSIZE   040
@@ -33,7 +33,7 @@ index d5fa89a204..d458e85af2 100644
  };
  
  struct DdIo {
-@@ -5091,6 +5093,19 @@ static int img_dd_osize(const char *arg,
+@@ -5087,6 +5089,19 @@ static int img_dd_osize(const char *arg,
      return 0;
  }
  
@@ -53,7 +53,7 @@ index d5fa89a204..d458e85af2 100644
  static int img_dd(int argc, char **argv)
  {
      int ret = 0;
-@@ -5105,12 +5120,14 @@ static int img_dd(int argc, char **argv)
+@@ -5101,12 +5116,14 @@ static int img_dd(int argc, char **argv)
      int c, i;
      const char *out_fmt = "raw";
      const char *fmt = NULL;
@@ -69,7 +69,7 @@ index d5fa89a204..d458e85af2 100644
      };
      struct DdIo in = {
          .bsz = 512, /* Block size is by default 512 bytes */
-@@ -5132,6 +5149,7 @@ static int img_dd(int argc, char **argv)
+@@ -5128,6 +5145,7 @@ static int img_dd(int argc, char **argv)
          { "of", img_dd_of, C_OF },
          { "skip", img_dd_skip, C_SKIP },
          { "osize", img_dd_osize, C_OSIZE },
@@ -77,7 +77,7 @@ index d5fa89a204..d458e85af2 100644
          { NULL, NULL, 0 }
      };
      const struct option long_options[] = {
-@@ -5328,9 +5346,10 @@ static int img_dd(int argc, char **argv)
+@@ -5324,9 +5342,10 @@ static int img_dd(int argc, char **argv)
  
      in.buf = g_new(uint8_t, in.bsz);
  
@@ -90,7 +90,7 @@ index d5fa89a204..d458e85af2 100644
          if (blk1) {
              in_ret = blk_pread(blk1, in_pos, bytes, in.buf, 0);
              if (in_ret == 0) {
-@@ -5339,6 +5358,9 @@ static int img_dd(int argc, char **argv)
+@@ -5335,6 +5354,9 @@ static int img_dd(int argc, char **argv)
          } else {
              in_ret = read(STDIN_FILENO, in.buf, bytes);
              if (in_ret == 0) {

debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-n-skip_create.patch

@@ -65,10 +65,10 @@ index 048788b23d..0b29a67a06 100644
  
  DEF("info", img_info,
 diff --git a/qemu-img.c b/qemu-img.c
-index d458e85af2..dc13efba8b 100644
+index b98184bba1..6fc8384f64 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
-@@ -5122,7 +5122,7 @@ static int img_dd(int argc, char **argv)
+@@ -5118,7 +5118,7 @@ static int img_dd(int argc, char **argv)
      const char *fmt = NULL;
      int64_t size = 0, readsize = 0;
      int64_t out_pos, in_pos;
@@ -77,7 +77,7 @@ index d458e85af2..dc13efba8b 100644
      struct DdInfo dd = {
          .flags = 0,
          .count = 0,
-@@ -5160,7 +5160,7 @@ static int img_dd(int argc, char **argv)
+@@ -5156,7 +5156,7 @@ static int img_dd(int argc, char **argv)
          { 0, 0, 0, 0 }
      };
  
@@ -86,7 +86,7 @@ index d458e85af2..dc13efba8b 100644
          if (c == EOF) {
              break;
          }
-@@ -5180,6 +5180,9 @@ static int img_dd(int argc, char **argv)
+@@ -5176,6 +5176,9 @@ static int img_dd(int argc, char **argv)
          case 'h':
              help();
              break;
@@ -96,7 +96,7 @@ index d458e85af2..dc13efba8b 100644
          case 'U':
              force_share = true;
              break;
-@@ -5310,13 +5313,15 @@ static int img_dd(int argc, char **argv)
+@@ -5306,13 +5309,15 @@ static int img_dd(int argc, char **argv)
                                  size - in.bsz * in.offset, &error_abort);
          }
  

debian/patches/pve/0012-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch

@@ -46,10 +46,10 @@ index 0b29a67a06..758f397232 100644
  
  DEF("info", img_info,
 diff --git a/qemu-img.c b/qemu-img.c
-index dc13efba8b..02f2e0aa45 100644
+index 6fc8384f64..a6c88e0860 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
-@@ -5114,6 +5114,7 @@ static int img_dd(int argc, char **argv)
+@@ -5110,6 +5110,7 @@ static int img_dd(int argc, char **argv)
      BlockDriver *drv = NULL, *proto_drv = NULL;
      BlockBackend *blk1 = NULL, *blk2 = NULL;
      QemuOpts *opts = NULL;
@@ -57,7 +57,7 @@ index dc13efba8b..02f2e0aa45 100644
      QemuOptsList *create_opts = NULL;
      Error *local_err = NULL;
      bool image_opts = false;
-@@ -5123,6 +5124,7 @@ static int img_dd(int argc, char **argv)
+@@ -5119,6 +5120,7 @@ static int img_dd(int argc, char **argv)
      int64_t size = 0, readsize = 0;
      int64_t out_pos, in_pos;
      bool force_share = false, skip_create = false;
@@ -65,7 +65,7 @@ index dc13efba8b..02f2e0aa45 100644
      struct DdInfo dd = {
          .flags = 0,
          .count = 0,
-@@ -5160,7 +5162,7 @@ static int img_dd(int argc, char **argv)
+@@ -5156,7 +5158,7 @@ static int img_dd(int argc, char **argv)
          { 0, 0, 0, 0 }
      };
  
@@ -74,7 +74,7 @@ index dc13efba8b..02f2e0aa45 100644
          if (c == EOF) {
              break;
          }
-@@ -5183,6 +5185,19 @@ static int img_dd(int argc, char **argv)
+@@ -5179,6 +5181,19 @@ static int img_dd(int argc, char **argv)
          case 'n':
              skip_create = true;
              break;
@@ -94,7 +94,7 @@ index dc13efba8b..02f2e0aa45 100644
          case 'U':
              force_share = true;
              break;
-@@ -5242,11 +5257,24 @@ static int img_dd(int argc, char **argv)
+@@ -5238,11 +5253,24 @@ static int img_dd(int argc, char **argv)
      if (dd.flags & C_IF) {
          blk1 = img_open(image_opts, in.filename, fmt, 0, false, false,
                          force_share);
@@ -120,7 +120,7 @@ index dc13efba8b..02f2e0aa45 100644
      }
  
      if (dd.flags & C_OSIZE) {
-@@ -5401,6 +5429,7 @@ static int img_dd(int argc, char **argv)
+@@ -5397,6 +5425,7 @@ static int img_dd(int argc, char **argv)
  out:
      g_free(arg);
      qemu_opts_del(opts);

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 c6325cdcaa..7f817d622d 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 c6325cdcaa..7f817d622d 100644
      qapi_free_BalloonInfo(info);
  }
 diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
-index 2eb5a14fa2..aa2fd6c32f 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 2eb5a14fa2..aa2fd6c32f 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

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 1bc21b84a4..93fb4bc24a 100644
+index 4b72009cd3..314351cdff 100644
 --- a/hw/core/machine-qmp-cmds.c
 +++ b/hw/core/machine-qmp-cmds.c
-@@ -91,6 +91,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");
@@ -26,14 +26,14 @@ index 1bc21b84a4..93fb4bc24a 100644
 +            info->is_current = true;
 +        }
 +
-         if (default_cpu_type) {
-             info->default_cpu_type = g_strdup(default_cpu_type);
+         if (mc->default_cpu_type) {
+             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' } }

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 c536d4e524..c2df48959b 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 c536d4e524..c2df48959b 100644
    'if': 'CONFIG_SPICE' }
  
 diff --git a/ui/spice-core.c b/ui/spice-core.c
-index d523d00200..c76c224706 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)

debian/patches/pve/0016-PVE-add-IOChannel-implementation-for-savevm-async.patch

@@ -25,7 +25,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 
 diff --git a/migration/channel-savevm-async.c b/migration/channel-savevm-async.c
 new file mode 100644
-index 0000000000..e57ab2ae40
+index 0000000000..081a192f49
 --- /dev/null
 +++ b/migration/channel-savevm-async.c
 @@ -0,0 +1,184 @@
@@ -35,7 +35,7 @@ index 0000000000..e57ab2ae40
 +#include "qemu/osdep.h"
 +#include "migration/channel-savevm-async.h"
 +#include "qapi/error.h"
-+#include "system/block-backend.h"
++#include "sysemu/block-backend.h"
 +#include "trace.h"
 +
 +QIOChannelSavevmAsync *
@@ -271,14 +271,14 @@ index 0000000000..17ae2cb261
 +
 +#endif /* QIO_CHANNEL_SAVEVM_ASYNC_H */
 diff --git a/migration/meson.build b/migration/meson.build
-index 9aa48b290e..cf66c78681 100644
+index 1eeb915ff6..95d1cf2250 100644
 --- a/migration/meson.build
 +++ b/migration/meson.build
-@@ -14,6 +14,7 @@ system_ss.add(files(
-   'block-active.c',
+@@ -13,6 +13,7 @@ system_ss.add(files(
+   'block-dirty-bitmap.c',
    'channel.c',
    'channel-block.c',
 +  'channel-savevm-async.c',
-   'cpr.c',
-   'cpr-transfer.c',
-   'cpu-throttle.c',
+   'dirtyrate.c',
+   'exec.c',
+   'fd.c',

debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch

@@ -27,34 +27,28 @@ Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
 [FE: further improve aborting
      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
-     improve setting state in savevm-end handler
-     improve runstate preservation
-     use dedicated iothread for state file to avoid deadlock, bug #6262]
+     adapt to QAPI and other changes for 8.2]
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
  hmp-commands-info.hx         |  13 +
- hmp-commands.hx              |  17 +
+ hmp-commands.hx              |  17 ++
  include/migration/snapshot.h |   2 +
  include/monitor/hmp.h        |   3 +
  migration/meson.build        |   1 +
- migration/savevm-async.c     | 581 +++++++++++++++++++++++++++++++++++
+ migration/savevm-async.c     | 531 +++++++++++++++++++++++++++++++++++
  monitor/hmp-cmds.c           |  38 +++
- qapi/migration.json          |  34 ++
+ qapi/migration.json          |  34 +++
  qapi/misc.json               |  18 ++
  qemu-options.hx              |  12 +
  system/vl.c                  |  10 +
- 11 files changed, 729 insertions(+)
+ 11 files changed, 679 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
  
@@ -75,10 +69,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
@@ -111,7 +105,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);
@@ -122,7 +116,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);
@@ -132,10 +126,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 cf66c78681..46e92249a1 100644
+index 95d1cf2250..800f12a60d 100644
 --- a/migration/meson.build
 +++ b/migration/meson.build
-@@ -33,6 +33,7 @@ system_ss.add(files(
+@@ -28,6 +28,7 @@ system_ss.add(files(
    'options.c',
    'postcopy-ram.c',
    'savevm.c',
@@ -145,10 +139,10 @@ index cf66c78681..46e92249a1 100644
    'threadinfo.c',
 diff --git a/migration/savevm-async.c b/migration/savevm-async.c
 new file mode 100644
-index 0000000000..56e0fa6c69
+index 0000000000..779e4e2a78
 --- /dev/null
 +++ b/migration/savevm-async.c
-@@ -0,0 +1,581 @@
+@@ -0,0 +1,531 @@
 +#include "qemu/osdep.h"
 +#include "migration/channel-savevm-async.h"
 +#include "migration/migration.h"
@@ -159,24 +153,21 @@ index 0000000000..56e0fa6c69
 +#include "migration/global_state.h"
 +#include "migration/ram.h"
 +#include "migration/qemu-file.h"
-+#include "system/cpu-throttle.h"
-+#include "system/system.h"
-+#include "system/runstate.h"
++#include "sysemu/sysemu.h"
++#include "sysemu/runstate.h"
 +#include "block/block.h"
-+#include "system/block-backend.h"
++#include "sysemu/block-backend.h"
 +#include "qapi/error.h"
 +#include "qapi/qmp/qerror.h"
-+#include "qobject/qdict.h"
++#include "qapi/qmp/qdict.h"
 +#include "qapi/qapi-commands-migration.h"
 +#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"
 +#include "qemu/yank.h"
-+#include "system/iothread.h"
 +
 +/* #define DEBUG_SAVEVM_STATE */
 +
@@ -203,13 +194,12 @@ index 0000000000..56e0fa6c69
 +    int state;
 +    Error *error;
 +    Error *blocker;
-+    int vm_needs_start;
++    int saved_vm_running;
 +    QEMUFile *file;
 +    int64_t total_time;
 +    QEMUBH *finalize_bh;
 +    Coroutine *co;
 +    QemuCoSleep target_close_wait;
-+    IOThread *iothread;
 +} snap_state;
 +
 +static bool savevm_aborted(void)
@@ -267,7 +257,6 @@ index 0000000000..56e0fa6c69
 +    }
 +
 +    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
@@ -276,9 +265,7 @@ index 0000000000..56e0fa6c69
 +            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);
@@ -302,7 +289,7 @@ index 0000000000..56e0fa6c69
 +    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);
@@ -331,7 +318,6 @@ index 0000000000..56e0fa6c69
 +     */
 +    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);
@@ -339,7 +325,7 @@ index 0000000000..56e0fa6c69
 +
 +    if (!aborted) {
 +        /* skip state saving if we aborted, snapshot will be invalid anyway */
-+        (void)qemu_savevm_state_complete_precopy(snap_state.file, false);
++        (void)qemu_savevm_state_complete_precopy(snap_state.file, false, false);
 +        ret = qemu_file_get_error(snap_state.file);
 +        if (ret < 0) {
 +            save_snapshot_error("qemu_savevm_state_complete_precopy error %d", ret);
@@ -355,12 +341,6 @@ index 0000000000..56e0fa6c69
 +        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();
@@ -378,9 +358,9 @@ index 0000000000..56e0fa6c69
 +        save_snapshot_error("process_savevm_cleanup: invalid state: %d",
 +                            snap_state.state);
 +    }
-+    if (snap_state.vm_needs_start) {
++    if (snap_state.saved_vm_running) {
 +        vm_start();
-+        snap_state.vm_needs_start = false;
++        snap_state.saved_vm_running = false;
 +    }
 +
 +    DPRINTF("timing: process_savevm_finalize (full) took %ld ms\n",
@@ -409,13 +389,16 @@ index 0000000000..56e0fa6c69
 +        uint64_t threshold = 400 * 1000;
 +
 +        /*
-+         * Similar to what is done in migration.c, call the exact variant only
-+         * once pend_precopy in the estimate is below the threshold.
++         * 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.
 +         */
++        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;
 +
 +        /*
@@ -482,33 +465,33 @@ index 0000000000..56e0fa6c69
 +    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();
-+    BlockDriverState *target_bs = NULL;
-+    int ret = 0;
++    AioContext *iohandler_ctx = iohandler_get_aio_context();
 +
 +    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;
 +    }
 +
 +    /* initialize snapshot info */
++    snap_state.saved_vm_running = runstate_is_running();
 +    snap_state.bs_pos = 0;
 +    snap_state.total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
 +    snap_state.blocker = NULL;
@@ -520,27 +503,13 @@ index 0000000000..56e0fa6c69
 +    }
 +
 +    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)) {
-+        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;
-+        }
++        return;
 +    }
 +
 +    /* Open the image */
@@ -549,13 +518,8 @@ index 0000000000..56e0fa6c69
 +    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 fail;
-+    }
-+    target_bs = blk_bs(snap_state.target);
-+    if (!target_bs) {
-+        error_setg(errp, "failed to open '%s' - no block driver state", statefile);
-+        goto fail;
++        error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile);
++        goto restart;
 +    }
 +
 +    QIOChannel *ioc = QIO_CHANNEL(qio_channel_savevm_async_new(snap_state.target,
@@ -563,8 +527,8 @@ index 0000000000..56e0fa6c69
 +    snap_state.file = qemu_file_new_output(ioc);
 +
 +    if (!snap_state.file) {
-+        error_setg(errp, "failed to open '%s'", statefile);
-+        goto fail;
++        error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile);
++        goto restart;
 +    }
 +
 +    /*
@@ -572,65 +536,81 @@ index 0000000000..56e0fa6c69
 +     * 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) != 0) {
-+        goto fail;
++    if (migrate_init(ms, errp)) {
++        return;
 +    }
 +    memset(&mig_stats, 0, sizeof(mig_stats));
 +    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);
-+    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");
-+        goto fail;
-+    }
-+
-+    ret = blk_set_aio_context(snap_state.target, snap_state.iothread->ctx, &local_err);
-+    if (ret != 0) {
-+        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);
-+    aio_co_schedule(snap_state.iothread->ctx, snap_state.co);
++    qemu_savevm_state_header(snap_state.file);
++    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.
++     */
++    blk_set_aio_context(snap_state.target, iohandler_ctx, &local_err);
++
++    aio_co_schedule(iohandler_ctx, snap_state.co);
 +
 +    return;
 +
-+fail:
-+    savevm_cleanup_iothread();
++restart:
++
 +    save_snapshot_error("setup failed");
++
++    if (snap_state.saved_vm_running) {
++        vm_start();
++        snap_state.saved_vm_running = false;
++    }
 +}
 +
-+static void coroutine_fn wait_for_close_co(void *opaque)
++void coroutine_fn qmp_savevm_end(Error **errp)
 +{
 +    int64_t timeout;
 +
-+    if (snap_state.target) {
-+        /* 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");
++    if (snap_state.state == SAVE_STATE_DONE) {
++        error_set(errp, ERROR_CLASS_GENERIC_ERROR,
++                  "VM snapshot not started\n");
++        return;
 +    }
 +
-+    savevm_cleanup_iothread();
++    if (snap_state.state == SAVE_STATE_ACTIVE) {
++        snap_state.state = SAVE_STATE_CANCELLED;
++        goto wait_for_close;
++    }
++
++    if (snap_state.saved_vm_running) {
++        vm_start();
++        snap_state.saved_vm_running = false;
++    }
++
++    snap_state.state = SAVE_STATE_DONE;
++
++wait_for_close:
++    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;
++    }
 +
 +    // File closed and no other error, so ensure next snapshot can be started.
 +    if (snap_state.state != SAVE_STATE_ERROR) {
@@ -640,59 +620,25 @@ index 0000000000..56e0fa6c69
 +    DPRINTF("savevm-end: cleanup done\n");
 +}
 +
-+void qmp_savevm_end(Error **errp)
-+{
-+    if (snap_state.state == SAVE_STATE_DONE) {
-+        error_setg(errp, "VM snapshot not started\n");
-+        return;
-+    }
-+
-+    Coroutine *wait_for_close = qemu_coroutine_create(wait_for_close_co, NULL);
-+
-+    if (snap_state.state == SAVE_STATE_ACTIVE) {
-+        snap_state.state = SAVE_STATE_CANCELLED;
-+        qemu_coroutine_enter(wait_for_close);
-+        return;
-+    }
-+
-+    if (snap_state.vm_needs_start) {
-+        vm_start();
-+        snap_state.vm_needs_start = false;
-+    }
-+
-+    qemu_coroutine_enter(wait_for_close);
-+}
-+
 +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)));
@@ -722,30 +668,28 @@ index 0000000000..56e0fa6c69
 +
 + 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 7ded3378cf..bade2a4b92 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 "qobject/qdict.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'\n", 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)
 +{
@@ -784,10 +728,10 @@ index 7ded3378cf..bade2a4b92 100644
 +    }
 +}
 diff --git a/qapi/migration.json b/qapi/migration.json
-index 8b9c53595c..ff3479da65 100644
+index 8c65b90328..ed20d066cd 100644
 --- a/qapi/migration.json
 +++ b/qapi/migration.json
-@@ -279,6 +279,40 @@
+@@ -297,6 +297,40 @@
             '*dirty-limit-throttle-time-per-round': 'uint64',
             '*dirty-limit-ring-full-time': 'uint64'} }
  
@@ -829,7 +773,7 @@ index 8b9c53595c..ff3479da65 100644
  # @query-migrate:
  #
 diff --git a/qapi/misc.json b/qapi/misc.json
-index 559b66f201..7959e89c1e 100644
+index ec30e5c570..7147199a12 100644
 --- a/qapi/misc.json
 +++ b/qapi/misc.json
 @@ -454,6 +454,24 @@
@@ -852,16 +796,16 @@ index 559b66f201..7959e89c1e 100644
 +# Resume VM after a snapshot.
 +#
 +##
-+{ 'command': 'savevm-end' }
++{ 'command': 'savevm-end', 'coroutine': true }
 +
  ##
  # @CommandLineParameterType:
  #
 diff --git a/qemu-options.hx b/qemu-options.hx
-index dc694a99a3..defee0c06a 100644
+index 8ce85d4559..511ab9415e 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
-@@ -4862,6 +4862,18 @@ SRST
+@@ -4610,6 +4610,18 @@ SRST
      Start right away with a saved state (``loadvm`` in monitor)
  ERST
  
@@ -881,10 +825,10 @@ index dc694a99a3..defee0c06a 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 ec93988a03..9b36ace6b4 100644
+index c644222982..2738ab7c91 100644
 --- a/system/vl.c
 +++ b/system/vl.c
-@@ -171,6 +171,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;
@@ -892,7 +836,7 @@ index ec93988a03..9b36ace6b4 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;
-@@ -2814,6 +2815,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);
@@ -905,7 +849,7 @@ index ec93988a03..9b36ace6b4 100644
      }
      if (replay_mode != REPLAY_MODE_NONE) {
          replay_vmstate_init();
-@@ -3360,6 +3367,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;

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 1303a5bf58..6e2d58d5c0 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"
  
@@ -31,9 +31,9 @@ index 1303a5bf58..6e2d58d5c0 100644
 +#define DEFAULT_IO_BUF_SIZE 32768
 +#define MAX_IOV_SIZE MIN_CONST(IOV_MAX, 256)
  
- typedef struct FdEntry {
-     QTAILQ_ENTRY(FdEntry) entry;
-@@ -48,7 +48,8 @@ struct QEMUFile {
+ struct QEMUFile {
+     QIOChannel *ioc;
+@@ -44,7 +44,8 @@ struct QEMUFile {
  
      int buf_index;
      int buf_size; /* 0 when writing */
@@ -43,7 +43,7 @@ index 1303a5bf58..6e2d58d5c0 100644
  
      DECLARE_BITMAP(may_free, MAX_IOV_SIZE);
      struct iovec iov[MAX_IOV_SIZE];
-@@ -108,7 +109,9 @@ int qemu_file_shutdown(QEMUFile *f)
+@@ -101,7 +102,9 @@ int qemu_file_shutdown(QEMUFile *f)
      return 0;
  }
  
@@ -54,16 +54,16 @@ index 1303a5bf58..6e2d58d5c0 100644
  {
      QEMUFile *f;
  
-@@ -119,6 +122,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;
-     f->can_pass_fd = qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_FD_PASS);
-     QTAILQ_INIT(&f->fds);
 +    f->buf_allocated_size = buffer_size;
 +    f->buf = malloc(buffer_size);
  
      return f;
  }
-@@ -129,17 +134,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,17 +94,17 @@ index 1303a5bf58..6e2d58d5c0 100644
  }
  
  /*
-@@ -339,7 +354,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 {
--        struct iovec iov = { f->buf + pending, IO_BUF_SIZE - pending };
-+        struct iovec iov = { f->buf + pending, f->buf_allocated_size - pending };
-         len = qio_channel_readv_full(f->ioc, &iov, 1, pfds, pnfd, 0,
-                                      &local_error);
+         len = qio_channel_read(f->ioc,
+                                (char *)f->buf + pending,
+-                               IO_BUF_SIZE - pending,
++                               f->buf_allocated_size - pending,
+                                &local_error);
          if (len == QIO_CHANNEL_ERR_BLOCK) {
-@@ -443,6 +458,9 @@ int qemu_fclose(QEMUFile *f)
-         g_free(fde);
+             if (qemu_in_coroutine()) {
+@@ -368,6 +383,9 @@ int qemu_fclose(QEMUFile *f)
+         ret = ret2;
      }
      g_clear_pointer(&f->ioc, object_unref);
 +
@@ -113,7 +113,7 @@ index 1303a5bf58..6e2d58d5c0 100644
      error_free(f->last_error_obj);
      g_free(f);
      trace_qemu_file_fclose();
-@@ -491,7 +509,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 1303a5bf58..6e2d58d5c0 100644
              qemu_fflush(f);
          }
      }
-@@ -516,7 +534,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 1303a5bf58..6e2d58d5c0 100644
          if (l > size) {
              l = size;
          }
-@@ -662,8 +680,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 1303a5bf58..6e2d58d5c0 100644
  
      /* The 1st byte to read from */
      index = f->buf_index + offset;
-@@ -713,7 +731,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 1303a5bf58..6e2d58d5c0 100644
          if (res == 0) {
              return done;
          }
-@@ -747,7 +765,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 1303a5bf58..6e2d58d5c0 100644
          size_t res;
          uint8_t *src = NULL;
  
-@@ -772,7 +790,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 1303a5bf58..6e2d58d5c0 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 f5b9f430e0..0179b90698 100644
+index 32fd4a34fd..36a0cd8cc8 100644
 --- a/migration/qemu-file.h
 +++ b/migration/qemu-file.h
 @@ -30,7 +30,9 @@
@@ -182,12 +191,12 @@ index f5b9f430e0..0179b90698 100644
 +QEMUFile *qemu_file_new_output_sized(QIOChannel *ioc, size_t buffer_size);
  int qemu_fclose(QEMUFile *f);
  
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(QEMUFile, qemu_fclose)
+ /*
 diff --git a/migration/savevm-async.c b/migration/savevm-async.c
-index 56e0fa6c69..730b815494 100644
+index 779e4e2a78..bf36fc06d2 100644
 --- a/migration/savevm-async.c
 +++ b/migration/savevm-async.c
-@@ -409,7 +409,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 56e0fa6c69..730b815494 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);
-@@ -544,7 +544,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);
+@@ -496,7 +496,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)));

debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch

@@ -5,17 +5,16 @@ Subject: [PATCH] PVE: block: add the zeroinit block driver filter
 
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 [FE: adapt to changed function signatures
-     adhere to block graph lock requirements
-     use dedicated function to open file child]
+     adhere to block graph lock requirements]
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
  block/meson.build |   1 +
- block/zeroinit.c  | 207 ++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 208 insertions(+)
+ block/zeroinit.c  | 214 ++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 215 insertions(+)
  create mode 100644 block/zeroinit.c
 
 diff --git a/block/meson.build b/block/meson.build
-index 34b1b2a306..a21d9a5411 100644
+index e1f03fd773..b530e117b5 100644
 --- a/block/meson.build
 +++ b/block/meson.build
 @@ -39,6 +39,7 @@ block_ss.add(files(
@@ -23,15 +22,15 @@ index 34b1b2a306..a21d9a5411 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..f9d513db15
+index 0000000000..696558d8d6
 --- /dev/null
 +++ b/block/zeroinit.c
-@@ -0,0 +1,207 @@
+@@ -0,0 +1,214 @@
 +/*
 + * Filter to fake a zero-initialized block device.
 + *
@@ -47,8 +46,8 @@ index 0000000000..f9d513db15
 +#include "block/block_int.h"
 +#include "block/block-io.h"
 +#include "block/graph-lock.h"
-+#include "qobject/qdict.h"
-+#include "qobject/qstring.h"
++#include "qapi/qmp/qdict.h"
++#include "qapi/qmp/qstring.h"
 +#include "qemu/cutils.h"
 +#include "qemu/option.h"
 +#include "qemu/module.h"
@@ -97,6 +96,7 @@ index 0000000000..f9d513db15
 +                          Error **errp)
 +{
 +    BDRVZeroinitState *s = bs->opaque;
++    BdrvChild *file = NULL;
 +    QemuOpts *opts;
 +    Error *local_err = NULL;
 +    int ret;
@@ -112,9 +112,15 @@ index 0000000000..f9d513db15
 +    }
 +
 +    /* Open the raw file */
-+    ret = bdrv_open_file_child(qemu_opt_get(opts, "x-next"), options, "next",
-+                               bs, &local_err);
-+    if (ret < 0) {
++    file = bdrv_open_child(qemu_opt_get(opts, "x-next"), options, "next", bs,
++                           &child_of_bds,
++                           BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, false,
++                           &local_err);
++    bdrv_graph_wrlock();
++    bs->file = file;
++    bdrv_graph_wrunlock();
++    if (local_err) {
++        ret = -EINVAL;
 +        error_propagate(errp, local_err);
 +        goto fail;
 +    }
@@ -212,7 +218,7 @@ index 0000000000..f9d513db15
 +    .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,

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 defee0c06a..fb980a05cf 100644
+index 511ab9415e..92e301d545 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
-@@ -1280,6 +1280,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 defee0c06a..fb980a05cf 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 9b36ace6b4..452742ab58 100644
+index 2738ab7c91..20ebf2c920 100644
 --- a/system/vl.c
 +++ b/system/vl.c
-@@ -2854,6 +2854,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 9b36ace6b4..452742ab58 100644
  
      qemu_add_opts(&qemu_drive_opts);
      qemu_add_drive_opts(&qemu_legacy_drive_opts);
-@@ -3472,6 +3473,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;

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 2a3e878c4d..efbed1aea3 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)

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 cfa0b832ba..d5c28cccc9 100644
+index 43bc0bd520..60e98c87f1 100644
 --- a/block/file-posix.c
 +++ b/block/file-posix.c
-@@ -2897,6 +2897,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 cfa0b832ba..d5c28cccc9 100644
  
      /* Validate options and set default values */
      assert(options->driver == BLOCKDEV_DRIVER_FILE);
-@@ -2937,19 +2938,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 cfa0b832ba..d5c28cccc9 100644
      }
  
      /* Clear the file by truncating it to 0 */
-@@ -3003,13 +3007,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 cfa0b832ba..d5c28cccc9 100644
      }
  
  out_close:
-@@ -3033,6 +3039,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 cfa0b832ba..d5c28cccc9 100644
  
      /* Skip file: protocol prefix */
      strstart(filename, "file:", &filename);
-@@ -3055,6 +3062,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 cfa0b832ba..d5c28cccc9 100644
      options = (BlockdevCreateOptions) {
          .driver     = BLOCKDEV_DRIVER_FILE,
          .u.file     = {
-@@ -3066,6 +3085,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 cfa0b832ba..d5c28cccc9 100644
      };
      return raw_co_create(&options, errp);
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 0e5f148d30..1c05413916 100644
+index 45ab548dfe..f7c2b63c5d 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -5016,6 +5016,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 0e5f148d30..1c05413916 100644
  # Since: 2.12
  ##
  { 'struct': 'BlockdevCreateOptionsFile',
-@@ -5023,7 +5027,8 @@
+@@ -4963,7 +4967,8 @@
              'size':                 'size',
              '*preallocation':       'PreallocMode',
              '*nocow':               'bool',

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 f093e256e9..78f1c8e3c8 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 */

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 63c6ef93d2..9a34017e5a 100644
+index 4273de16a0..83f1fc0293 100644
 --- a/hw/core/machine.c
 +++ b/hw/core/machine.c
-@@ -193,7 +193,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" },

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 93fb4bc24a..b9999423b4 100644
+index 314351cdff..628a3537c5 100644
 --- a/hw/core/machine-qmp-cmds.c
 +++ b/hw/core/machine-qmp-cmds.c
-@@ -95,6 +95,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;
@@ -35,66 +35,67 @@ index 93fb4bc24a..b9999423b4 100644
 +            }
          }
  
-         if (default_cpu_type) {
+         if (mc->default_cpu_type) {
 diff --git a/include/hw/boards.h b/include/hw/boards.h
-index f22b2e7fc7..8ada4d5832 100644
+index 8b8f6d5c00..dd6d0a1447 100644
 --- a/include/hw/boards.h
 +++ b/include/hw/boards.h
-@@ -271,6 +271,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 452742ab58..c3707b2412 100644
+index 20ebf2c920..4d39e32097 100644
 --- a/system/vl.c
 +++ b/system/vl.c
-@@ -1674,6 +1674,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)
+         }
+     }
  
-@@ -1693,7 +1694,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;
- }
- 
-@@ -3414,12 +3419,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;

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 79652bf57b..cc747e9163 100644
+index ec29d6b810..270957c0cd 100644
 --- a/block/backup.c
 +++ b/block/backup.c
 @@ -237,8 +237,8 @@ static void backup_init_bcs_bitmap(BackupBlockJob *job)
@@ -48,7 +48,7 @@ index 79652bf57b..cc747e9163 100644
      if (s->sync_mode == MIRROR_SYNC_MODE_TOP) {
          int64_t offset = 0;
          int64_t count;
-@@ -502,6 +500,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
+@@ -501,6 +499,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
                         &error_abort);
      bdrv_graph_wrunlock();
  

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      | 818 +++++++++++++++++++++++++++++++++++++++++
+ vma.c             | 901 ++++++++++++++++++++++++++++++++++++++++++++++
  vma.h             | 150 ++++++++
- 6 files changed, 2781 insertions(+)
+ 6 files changed, 2746 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 a21d9a5411..1373612c10 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 a21d9a5411..1373612c10 100644
  system_ss.add(files('block-ram-registrar.c'))
  
 diff --git a/meson.build b/meson.build
-index 8ec796d835..680ab48b9b 100644
+index 91a0aa64c6..620cc594b2 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2161,6 +2161,8 @@ endif
+@@ -1922,6 +1922,8 @@ endif
  
  has_gettid = cc.has_function('gettid')
  
@@ -52,22 +51,22 @@ index 8ec796d835..680ab48b9b 100644
  # libselinux
  selinux = dependency('libselinux',
                       required: get_option('selinux'),
-@@ -4367,6 +4369,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..1888b21851
+index 0000000000..d0b6721812
 --- /dev/null
 +++ b/vma-reader.c
-@@ -0,0 +1,867 @@
+@@ -0,0 +1,870 @@
 +/*
 + * VMA: Virtual Machine Archive
 + *
@@ -90,7 +89,7 @@ index 0000000000..1888b21851
 +#include "vma.h"
 +#include "block/block.h"
 +#include "block/graph-lock.h"
-+#include "system/block-backend.h"
++#include "sysemu/block-backend.h"
 +
 +static unsigned char zero_vma_block[VMA_BLOCK_SIZE];
 +
@@ -382,6 +381,7 @@ index 0000000000..1888b21851
 +    }
 +
 +
++    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..1888b21851
 +        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..1888b21851
 +
 +            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..1888b21851
 +
 diff --git a/vma-writer.c b/vma-writer.c
 new file mode 100644
-index 0000000000..3f489092df
+index 0000000000..126b296647
 --- /dev/null
 +++ b/vma-writer.c
-@@ -0,0 +1,816 @@
+@@ -0,0 +1,818 @@
 +/*
 + * 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;
 +
@@ -1514,16 +1517,17 @@ index 0000000000..3f489092df
 +    int i;
 +
 +    g_assert(vmaw != NULL);
-+    g_assert(status != NULL);
 +
-+    status->status = vmaw->status;
-+    g_strlcpy(status->errmsg, vmaw->errmsg, sizeof(status->errmsg));
-+    for (i = 0; i <= 255; i++) {
-+        status->stream_info[i] = vmaw->stream_info[i];
++    if (status) {
++        status->status = vmaw->status;
++        g_strlcpy(status->errmsg, vmaw->errmsg, sizeof(status->errmsg));
++        for (i = 0; i <= 255; i++) {
++            status->stream_info[i] = vmaw->stream_info[i];
++        }
++
++        uuid_unparse_lower(vmaw->uuid, status->uuid_str);
 +    }
 +
-+    uuid_unparse_lower(vmaw->uuid, status->uuid_str);
-+
 +    status->closed = vmaw->closed;
 +
 +    return vmaw->status;
@@ -1759,10 +1763,10 @@ index 0000000000..3f489092df
 +}
 diff --git a/vma.c b/vma.c
 new file mode 100644
-index 0000000000..0e990b5e30
+index 0000000000..bb715e9061
 --- /dev/null
 +++ b/vma.c
-@@ -0,0 +1,941 @@
+@@ -0,0 +1,901 @@
 +/*
 + * VMA: Virtual Machine Archive
 + *
@@ -1785,8 +1789,8 @@ index 0000000000..0e990b5e30
 +#include "qemu/main-loop.h"
 +#include "qemu/cutils.h"
 +#include "qemu/memalign.h"
-+#include "qobject/qdict.h"
-+#include "system/block-backend.h"
++#include "qapi/qmp/qdict.h"
++#include "sysemu/block-backend.h"
 +
 +static void help(void)
 +{
@@ -1794,8 +1798,8 @@ index 0000000000..0e990b5e30
 +        "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 +2390,12 @@ index 0000000000..0e990b5e30
 +{
 +    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 +2407,6 @@ index 0000000000..0e990b5e30
 +        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 +2452,16 @@ index 0000000000..0e990b5e30
 +        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 +2483,6 @@ index 0000000000..0e990b5e30
 +        // 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 +2564,6 @@ index 0000000000..0e990b5e30
 +
 +    g_list_free(backup_coroutines);
 +    g_list_free(config_files);
-+    g_list_free(disk_infos);
 +    vma_writer_destroy(vmaw);
 +    return 0;
 +}

debian/patches/pve/0028-PVE-Backup-add-backup-dump-block-driver.patch

@@ -22,7 +22,7 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 
 diff --git a/block/backup-dump.c b/block/backup-dump.c
 new file mode 100644
-index 0000000000..354593bc10
+index 0000000000..e46abf1070
 --- /dev/null
 +++ b/block/backup-dump.c
 @@ -0,0 +1,172 @@
@@ -38,7 +38,7 @@ index 0000000000..354593bc10
 +
 +#include "qemu/osdep.h"
 +
-+#include "qobject/qdict.h"
++#include "qapi/qmp/qdict.h"
 +#include "qom/object_interfaces.h"
 +#include "block/block_int.h"
 +
@@ -199,7 +199,7 @@ index 0000000000..354593bc10
 +    return bs;
 +}
 diff --git a/block/backup.c b/block/backup.c
-index cc747e9163..6f7c45f922 100644
+index 270957c0cd..16d611c4ca 100644
 --- a/block/backup.c
 +++ b/block/backup.c
 @@ -29,28 +29,6 @@
@@ -231,7 +231,7 @@ index cc747e9163..6f7c45f922 100644
  static const BlockJobDriver backup_job_driver;
  
  static void backup_cleanup_sync_bitmap(BackupBlockJob *job, int ret)
-@@ -462,6 +440,14 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
+@@ -461,6 +439,14 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
      }
  
      cluster_size = block_copy_cluster_size(bcs);
@@ -247,7 +247,7 @@ index cc747e9163..6f7c45f922 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 1373612c10..6278c4af0f 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 1373612c10..6278c4af0f 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 @@
@@ -312,10 +312,10 @@ index ebb4e56a50..e717a74e5f 100644
      BDRV_TRACKED_READ,
      BDRV_TRACKED_WRITE,
 diff --git a/job.c b/job.c
-index 0653bc2ba6..b981070ee8 100644
+index 660ce22c56..baf54c8d60 100644
 --- a/job.c
 +++ b/job.c
-@@ -337,7 +337,8 @@ static bool job_started_locked(Job *job)
+@@ -331,7 +331,8 @@ static bool job_started_locked(Job *job)
  }
  
  /* Called with job_mutex held. */

debian/patches/pve/0029-PVE-Add-sequential-job-transaction-support.patch

@@ -11,7 +11,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  2 files changed, 46 insertions(+)
 
 diff --git a/include/qemu/job.h b/include/qemu/job.h
-index a5a04155ea..562cc7eaec 100644
+index 2b873f2576..528cd6acb9 100644
 --- a/include/qemu/job.h
 +++ b/include/qemu/job.h
 @@ -362,6 +362,18 @@ void job_unlock(void);
@@ -34,7 +34,7 @@ index a5a04155ea..562cc7eaec 100644
   * Release a reference that was previously acquired with job_txn_add_job or
   * job_txn_new. If it's the last reference to the object, it will be freed.
 diff --git a/job.c b/job.c
-index b981070ee8..f4646866ec 100644
+index baf54c8d60..3ac5e5cde2 100644
 --- a/job.c
 +++ b/job.c
 @@ -94,6 +94,8 @@ struct JobTxn {
@@ -72,7 +72,7 @@ index b981070ee8..f4646866ec 100644
  /* Called with job_mutex held. */
  static void job_txn_ref_locked(JobTxn *txn)
  {
-@@ -1048,6 +1069,12 @@ static void job_completed_txn_success_locked(Job *job)
+@@ -1042,6 +1063,12 @@ static void job_completed_txn_success_locked(Job *job)
       */
      QLIST_FOREACH(other_job, &txn->jobs, txn_list) {
          if (!job_is_completed_locked(other_job)) {
@@ -85,7 +85,7 @@ index b981070ee8..f4646866ec 100644
              return;
          }
          assert(other_job->ret == 0);
-@@ -1259,6 +1286,13 @@ int job_finish_sync_locked(Job *job,
+@@ -1253,6 +1280,13 @@ int job_finish_sync_locked(Job *job,
          return -EBUSY;
      }
  

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                   | 1096 ++++++++++++++++++++++++++++++++
+ pve-backup.c                   | 1098 ++++++++++++++++++++++++++++++++
  qapi/block-core.json           |  233 +++++++
  qapi/common.json               |   14 +
  qapi/machine.json              |   16 +-
- 14 files changed, 1715 insertions(+), 14 deletions(-)
+ 14 files changed, 1717 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 6278c4af0f..d1b16e40e9 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 6278c4af0f..d1b16e40e9 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 6919a49bf5..4f30f99644 100644
+index d954bec6f1..5000c084c5 100644
 --- a/block/monitor/block-hmp-cmds.c
 +++ b/block/monitor/block-hmp-cmds.c
-@@ -1010,3 +1010,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 6919a49bf5..4f30f99644 100644
 +    hmp_handle_error(mon, error);
 +}
 diff --git a/blockdev.c b/blockdev.c
-index 158ac9314b..17de5d2ae4 100644
+index d27d8c38ec..5e5dbc1da9 100644
 --- a/blockdev.c
 +++ b/blockdev.c
 @@ -37,6 +37,7 @@
@@ -179,10 +179,10 @@ index 158ac9314b..17de5d2ae4 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 680ab48b9b..1f74de1d93 100644
+index 620cc594b2..d16b97cf3c 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2162,6 +2162,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 680ab48b9b..1f74de1d93 100644
  # libselinux
  selinux = dependency('libselinux',
 diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
-index bade2a4b92..77a2fa409a 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,23 +586,22 @@ index 0000000000..8cbf645b2c
 +#endif /* PROXMOX_BACKUP_CLIENT_H */
 diff --git a/pve-backup.c b/pve-backup.c
 new file mode 100644
-index 0000000000..e931cb9203
+index 0000000000..9c13a92623
 --- /dev/null
 +++ b/pve-backup.c
-@@ -0,0 +1,1096 @@
+@@ -0,0 +1,1098 @@
 +#include "proxmox-backup-client.h"
 +#include "vma.h"
 +
 +#include "qemu/osdep.h"
 +#include "qemu/module.h"
-+#include "system/block-backend.h"
-+#include "system/blockdev.h"
++#include "sysemu/block-backend.h"
++#include "sysemu/blockdev.h"
 +#include "block/block_int-global-state.h"
 +#include "block/blockjob.h"
 +#include "block/dirty-bitmap.h"
 +#include "block/graph-lock.h"
 +#include "qapi/qapi-commands-block.h"
-+#include "qobject/qdict.h"
 +#include "qapi/qmp/qerror.h"
 +#include "qemu/cutils.h"
 +
@@ -627,6 +626,7 @@ index 0000000000..e931cb9203
 + * ---end-bad-example--
 + *
 + * ==> Always use CoMutext inside coroutines.
++ * ==> Never acquire/release AioContext withing coroutines (because that use QemuRecMutex)
 + *
 + */
 +
@@ -678,8 +678,8 @@ index 0000000000..e931cb9203
 +    size_t size;
 +    uint64_t block_size;
 +    uint8_t dev_id;
-+    char* device_name;
 +    int completed_ret; // INT_MAX if not completed
++    char targetfile[PATH_MAX];
 +    BdrvDirtyBitmap *bitmap;
 +    BlockDriverState *target;
 +    BlockJob *job;
@@ -912,8 +912,6 @@ index 0000000000..e931cb9203
 +    }
 +
 +    di->bs = NULL;
-+    g_free(di->device_name);
-+    di->device_name = NULL;
 +
 +    assert(di->target == NULL);
 +
@@ -1080,7 +1078,8 @@ index 0000000000..e931cb9203
 +}
 +
 +/*
-+ * backup_job_create can *not* be run from a coroutine, so this can't either.
++ * backup_job_create can *not* be run from a coroutine (and requires an
++ * acquired AioContext), so this can't either.
 + * The caller is responsible that backup_mutex is held nonetheless.
 + */
 +static void create_backup_jobs_bh(void *opaque) {
@@ -1198,13 +1197,11 @@ index 0000000000..e931cb9203
 +            }
 +            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);
 +            di->bs = bs;
-+            di->device_name = g_strdup(bdrv_get_device_name(bs));
-+
 +            di_list = g_list_append(di_list, di);
 +            d++;
 +        }
@@ -1218,7 +1215,6 @@ index 0000000000..e931cb9203
 +
 +            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);
 +        }
 +    }
@@ -1385,6 +1381,9 @@ index 0000000000..e931cb9203
 +
 +            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;
 +
@@ -1399,8 +1398,7 @@ index 0000000000..e931cb9203
 +                    }
 +                    action = PBS_BITMAP_ACTION_NEW;
 +                } else {
-+                    expect_only_dirty =
-+                        proxmox_backup_check_incremental(pbs, di->device_name, di->size) != 0;
++                    expect_only_dirty = proxmox_backup_check_incremental(pbs, devname, di->size) != 0;
 +                }
 +
 +                if (expect_only_dirty) {
@@ -1424,8 +1422,7 @@ index 0000000000..e931cb9203
 +                }
 +            }
 +
-+            int dev_id = proxmox_backup_co_register_image(pbs, di->device_name, di->size,
-+                                                          expect_only_dirty, errp);
++            int dev_id = proxmox_backup_co_register_image(pbs, devname, di->size, expect_only_dirty, errp);
 +            if (dev_id < 0) {
 +                goto err_mutex;
 +            }
@@ -1437,7 +1434,7 @@ index 0000000000..e931cb9203
 +            di->dev_id = dev_id;
 +
 +            PBSBitmapInfo *info = g_malloc(sizeof(*info));
-+            info->drive = g_strdup(di->device_name);
++            info->drive = g_strdup(devname);
 +            info->action = action;
 +            info->size = di->size;
 +            info->dirty = dirty;
@@ -1446,7 +1443,9 @@ index 0000000000..e931cb9203
 +    } 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;
 +        }
 +
@@ -1460,7 +1459,10 @@ index 0000000000..e931cb9203
 +                goto err_mutex;
 +            }
 +
-+            di->dev_id = vma_writer_register_stream(vmaw, di->device_name, di->size);
++            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);
 +            if (di->dev_id <= 0) {
 +                error_set(errp, ERROR_CLASS_GENERIC_ERROR,
 +                          "register_stream failed");
@@ -1571,9 +1573,9 @@ index 0000000000..e931cb9203
 +            bdrv_co_unref(di->target);
 +        }
 +
-+        g_free(di->device_name);
-+        di->device_name = NULL;
-+
++        if (di->targetfile[0]) {
++            unlink(di->targetfile);
++        }
 +        g_free(di);
 +    }
 +    g_list_free(di_list);
@@ -1687,10 +1689,10 @@ index 0000000000..e931cb9203
 +    return ret;
 +}
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 1c05413916..dd98e03bf1 100644
+index f7c2b63c5d..e49c7b5bc9 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -855,6 +855,239 @@
+@@ -851,6 +851,239 @@
  { 'command': 'query-block', 'returns': ['BlockInfo'],
    'allow-preconfig': true }
  
@@ -1829,7 +1831,7 @@ index 1c05413916..dd98e03bf1 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 }
@@ -1931,13 +1933,13 @@ index 1c05413916..dd98e03bf1 100644
  # @BlockDeviceTimedStats:
  #
 diff --git a/qapi/common.json b/qapi/common.json
-index 0e3a0bbbfb..554680c716 100644
+index 7558ce5430..6e3d800373 100644
 --- a/qapi/common.json
 +++ b/qapi/common.json
-@@ -226,3 +226,17 @@
+@@ -200,3 +200,17 @@
  ##
- { 'enum': 'EndianMode',
-   'data': [ 'unspecified', 'little', 'big' ] }
+ { 'struct': 'HumanReadableText',
+   'data': { 'human-readable-text': 'str' } }
 +
 +##
 +# @UuidInfo:
@@ -1948,12 +1950,12 @@ index 0e3a0bbbfb..554680c716 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 @@
@@ -1965,7 +1967,7 @@ index 12cfd3f260..a8abdb42a3 100644
  ##
  # = Machines
  ##
-@@ -302,20 +304,6 @@
+@@ -237,20 +239,6 @@
  ##
  { 'command': 'query-target', 'returns': 'TargetInfo' }
  
@@ -1978,8 +1980,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'} }
 -

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 1f74de1d93..8508aab9c9 100644
+index d16b97cf3c..6de51c34cb 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -4373,6 +4373,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')
@@ -30,7 +30,7 @@ index 1f74de1d93..8508aab9c9 100644
    foreach exe: [ 'qemu-img', 'qemu-io', 'qemu-nbd', 'qemu-storage-daemon']
 diff --git a/pbs-restore.c b/pbs-restore.c
 new file mode 100644
-index 0000000000..f165f418af
+index 0000000000..f03d9bab8d
 --- /dev/null
 +++ b/pbs-restore.c
 @@ -0,0 +1,236 @@
@@ -57,8 +57,8 @@ index 0000000000..f165f418af
 +#include "qemu/main-loop.h"
 +#include "qemu/cutils.h"
 +#include "qapi/error.h"
-+#include "qobject/qdict.h"
-+#include "system/block-backend.h"
++#include "qapi/qmp/qdict.h"
++#include "sysemu/block-backend.h"
 +
 +#include <proxmox-backup-qemu.h>
 +

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          | 307 +++++++++++++++++++++++++++++++++++++++++++
  meson.build          |   2 +-
  qapi/block-core.json |  29 ++++
  qapi/pragma.json     |   1 +
- 5 files changed, 339 insertions(+), 1 deletion(-)
+ 5 files changed, 340 insertions(+), 1 deletion(-)
  create mode 100644 block/pbs.c
 
 diff --git a/block/meson.build b/block/meson.build
-index d1b16e40e9..d243372c41 100644
+index 6bba803f94..1945e04eeb 100644
 --- a/block/meson.build
 +++ b/block/meson.build
 @@ -49,6 +49,8 @@ block_ss.add(files(
@@ -37,18 +37,18 @@ index d1b16e40e9..d243372c41 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..3e41421716
+index 0000000000..dd72356bd3
 --- /dev/null
 +++ b/block/pbs.c
-@@ -0,0 +1,306 @@
+@@ -0,0 +1,307 @@
 +/*
 + * Proxmox Backup Server read-only block driver
 + */
 +
 +#include "qemu/osdep.h"
 +#include "qapi/error.h"
-+#include "qobject/qdict.h"
-+#include "qobject/qstring.h"
++#include "qapi/qmp/qdict.h"
++#include "qapi/qmp/qstring.h"
 +#include "qemu/module.h"
 +#include "qemu/option.h"
 +#include "qemu/cutils.h"
@@ -68,7 +68,7 @@ index 0000000000..3e41421716
 +
 +typedef struct {
 +    ProxmoxRestoreHandle *conn;
-+    uint8_t aid;
++    char aid;
 +    int64_t length;
 +
 +    char *repository;
@@ -201,18 +201,12 @@ index 0000000000..3e41421716
 +    }
 +
 +    /* acquire handle and length */
-+    ret = proxmox_restore_open_image(s->conn, s->archive, &pbs_error);
-+    if (ret < 0) {
++    s->aid = proxmox_restore_open_image(s->conn, s->archive, &pbs_error);
++    if (s->aid < 0) {
 +        if (pbs_error && errp) error_setg(errp, "PBS open_image failed: %s", pbs_error);
 +        if (pbs_error) proxmox_backup_free_error(pbs_error);
 +        return -ENODEV;
 +    }
-+    if (ret > UINT8_MAX) {
-+        error_setg(errp, "PBS open_image returned an ID larger than %u", UINT8_MAX);
-+        return -ENODEV;
-+    }
-+    s->aid = ret;
-+
 +    s->length = proxmox_restore_get_image_length(s->conn, s->aid, &pbs_error);
 +    if (s->length < 0) {
 +        if (pbs_error && errp) error_setg(errp, "PBS get_image_length failed: %s", pbs_error);
@@ -223,6 +217,12 @@ index 0000000000..3e41421716
 +    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 +330,7 @@ index 0000000000..3e41421716
 +
 +    .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 +349,23 @@ index 0000000000..3e41421716
 +
 +block_init(bdrv_pbs_init);
 diff --git a/meson.build b/meson.build
-index 8508aab9c9..9c39f54f86 100644
+index 6de51c34cb..3bc039f60f 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -4838,7 +4838,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 dd98e03bf1..0c3ebfa74e 100644
+index e49c7b5bc9..fc32ff9957 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -3470,6 +3470,7 @@
+@@ -3457,6 +3457,7 @@
              'parallels', 'preallocate', 'qcow', 'qcow2', 'qed', 'quorum',
              'raw', 'rbd',
              { 'name': 'replication', 'if': 'CONFIG_REPLICATION' },
@@ -372,7 +373,7 @@ index dd98e03bf1..0c3ebfa74e 100644
              'ssh', 'throttle', 'vdi', 'vhdx',
              { 'name': 'virtio-blk-vfio-pci', 'if': 'CONFIG_BLKIO' },
              { 'name': 'virtio-blk-vhost-user', 'if': 'CONFIG_BLKIO' },
-@@ -3556,6 +3557,33 @@
+@@ -3543,6 +3544,33 @@
  { 'struct': 'BlockdevOptionsNull',
    'data': { '*size': 'int', '*latency-ns': 'uint64', '*read-zeroes': 'bool' } }
  
@@ -406,7 +407,7 @@ index dd98e03bf1..0c3ebfa74e 100644
  ##
  # @BlockdevOptionsNVMe:
  #
-@@ -5003,6 +5031,7 @@
+@@ -4977,6 +5005,7 @@
        'nfs':        'BlockdevOptionsNfs',
        'null-aio':   'BlockdevOptionsNull',
        'null-co':    'BlockdevOptionsNull',
@@ -415,10 +416,10 @@ index dd98e03bf1..0c3ebfa74e 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, ...

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 9c39f54f86..60af7fa723 100644
+index 3bc039f60f..067e8956a7 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2162,6 +2162,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 9c39f54f86..60af7fa723 100644
  libproxmox_backup_qemu = cc.find_library('proxmox_backup_qemu', required: true)
  
  # libselinux
-@@ -3766,7 +3767,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 9c39f54f86..60af7fa723 100644
  endif
  
 diff --git a/os-posix.c b/os-posix.c
-index 52925c23d3..84b96d3da9 100644
+index a4284e2c07..197a2120fd 100644
 --- a/os-posix.c
 +++ b/os-posix.c
 @@ -29,6 +29,8 @@
@@ -47,7 +47,7 @@ index 52925c23d3..84b96d3da9 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);

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 8fd36eba1d..e963e93e71 100644
+index c9e200f4eb..12c99ebc69 100644
 --- a/include/migration/misc.h
 +++ b/include/migration/misc.h
-@@ -140,4 +140,7 @@ bool multifd_device_state_save_thread_should_exit(void);
- void multifd_abort_device_state_save_threads(void);
- bool multifd_join_device_state_save_threads(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 46e92249a1..fb3fd7d7d0 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',
-@@ -31,6 +32,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 d46e776e24..2f3430f440 100644
+index 86bf76e925..b8d7e471a4 100644
 --- a/migration/migration.c
 +++ b/migration/migration.c
-@@ -319,6 +319,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 e931cb9203..366b015589 100644
+index 9c13a92623..9d480a8eec 100644
 --- a/pve-backup.c
 +++ b/pve-backup.c
-@@ -1089,6 +1089,7 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
+@@ -1091,6 +1091,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,10 +186,10 @@ index e931cb9203..366b015589 100644
      ret->pbs_masterkey = true;
      ret->backup_max_workers = true;
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 0c3ebfa74e..6838187607 100644
+index fc32ff9957..f516d8e95a 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -1008,6 +1008,11 @@
+@@ -1004,6 +1004,11 @@
  # @pbs-dirty-bitmap-savevm: True if 'dirty-bitmaps' migration capability can
  #                           safely be set for savevm-async.
  #
@@ -207,7 +201,7 @@ index 0c3ebfa74e..6838187607 100644
  # @pbs-masterkey: True if the QMP backup call supports the 'master_keyfile'
  #                 parameter.
  #
-@@ -1021,6 +1026,7 @@
+@@ -1017,6 +1022,7 @@
    'data': { 'pbs-dirty-bitmap': 'bool',
              'query-bitmap-info': 'bool',
              'pbs-dirty-bitmap-savevm': 'bool',

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 f2c352d4a7..931a8481e9 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;
          }
  

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 2f0f4dac09..b523137cff 100644
+index 2ff14b7472..46f275fbf7 100644
 --- a/block/iscsi.c
 +++ b/block/iscsi.c
 @@ -1392,12 +1392,42 @@ static char *get_initiator_name(QemuOpts *opts)

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 999d9e56d4..e187cd1262 100644
+index 7031eef12b..d2da83ae7c 100644
 --- a/block/stream.c
 +++ b/block/stream.c
 @@ -27,7 +27,7 @@ enum {

debian/patches/pve/0038-block-add-alloc-track-driver.patch

@@ -31,22 +31,21 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 [FE: adapt to changed function signatures
      make error return value consistent with QEMU
      avoid premature break during read
-     adhere to block graph lock requirements
-     avoid superfluous child permission update]
+     adhere to block graph lock requirements]
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
- block/alloc-track.c | 343 ++++++++++++++++++++++++++++++++++++++++++++
+ block/alloc-track.c | 366 ++++++++++++++++++++++++++++++++++++++++++++
  block/meson.build   |   1 +
- block/stream.c      |  34 +++++
- 3 files changed, 378 insertions(+)
+ block/stream.c      |  34 ++++
+ 3 files changed, 401 insertions(+)
  create mode 100644 block/alloc-track.c
 
 diff --git a/block/alloc-track.c b/block/alloc-track.c
 new file mode 100644
-index 0000000000..718aaabf2a
+index 0000000000..b9f8ea9137
 --- /dev/null
 +++ b/block/alloc-track.c
-@@ -0,0 +1,343 @@
+@@ -0,0 +1,366 @@
 +/*
 + * Node to allow backing images to be applied to any node. Assumes a blank
 + * image to begin with, only new writes are tracked as allocated, thus this
@@ -64,19 +63,26 @@ index 0000000000..718aaabf2a
 +#include "block/block_int.h"
 +#include "block/dirty-bitmap.h"
 +#include "block/graph-lock.h"
-+#include "qobject/qdict.h"
-+#include "qobject/qstring.h"
++#include "qapi/qmp/qdict.h"
++#include "qapi/qmp/qstring.h"
 +#include "qemu/cutils.h"
 +#include "qemu/error-report.h"
 +#include "qemu/option.h"
 +#include "qemu/module.h"
-+#include "system/block-backend.h"
++#include "sysemu/block-backend.h"
 +
 +#define TRACK_OPT_AUTO_REMOVE "auto-remove"
 +
++typedef enum DropState {
++    DropNone,
++    DropInProgress,
++} DropState;
++
 +typedef struct {
 +    BdrvDirtyBitmap *bitmap;
 +    uint64_t granularity;
++    DropState drop_state;
++    bool auto_remove;
 +} BDRVAllocTrackState;
 +
 +static QemuOptsList runtime_opts = {
@@ -128,11 +134,7 @@ index 0000000000..718aaabf2a
 +        goto fail;
 +    }
 +
-+    if (!qemu_opt_get_bool(opts, TRACK_OPT_AUTO_REMOVE, false)) {
-+        error_setg(errp, "alloc-track: requires auto-remove option to be set to on");
-+        ret = -EINVAL;
-+        goto fail;
-+    }
++    s->auto_remove = qemu_opt_get_bool(opts, TRACK_OPT_AUTO_REMOVE, false);
 +
 +    /* open the target (write) node, backing will be attached by block layer */
 +    file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,
@@ -180,6 +182,8 @@ index 0000000000..718aaabf2a
 +        goto fail;
 +    }
 +
++    s->drop_state = DropNone;
++
 +fail:
 +    if (ret < 0) {
 +        bdrv_graph_wrlock();
@@ -330,8 +334,18 @@ index 0000000000..718aaabf2a
 +                 BlockReopenQueue *reopen_queue, uint64_t perm, uint64_t shared,
 +                 uint64_t *nperm, uint64_t *nshared)
 +{
++    BDRVAllocTrackState *s = bs->opaque;
++
 +    *nshared = BLK_PERM_ALL;
 +
++    /* in case we're currently dropping ourselves, claim to not use any
++     * permissions at all - which is fine, since from this point on we will
++     * never issue a read or write anymore */
++    if (s->drop_state == DropInProgress) {
++        *nperm = 0;
++        return;
++    }
++
 +    if (role & BDRV_CHILD_DATA) {
 +        *nperm = perm & DEFAULT_PERM_PASSTHROUGH;
 +    } else {
@@ -357,6 +371,14 @@ index 0000000000..718aaabf2a
 +     * kinda fits better, but in the long-term, a special parameter would be
 +     * nice (or done via qemu-server via upcoming blockdev-replace QMP command).
 +     */
++    if (backing_file == NULL) {
++        BDRVAllocTrackState *s = bs->opaque;
++        bdrv_drained_begin(bs);
++        s->drop_state = DropInProgress;
++        bdrv_child_refresh_perms(bs, bs->file, &error_abort);
++        bdrv_drained_end(bs);
++    }
++
 +    return 0;
 +}
 +
@@ -364,7 +386,7 @@ index 0000000000..718aaabf2a
 +    .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,
@@ -391,7 +413,7 @@ index 0000000000..718aaabf2a
 +
 +block_init(bdrv_alloc_track_init);
 diff --git a/block/meson.build b/block/meson.build
-index d243372c41..9b45b5256d 100644
+index 1945e04eeb..2873f3a25a 100644
 --- a/block/meson.build
 +++ b/block/meson.build
 @@ -2,6 +2,7 @@ block_ss.add(genh)
@@ -403,7 +425,7 @@ index d243372c41..9b45b5256d 100644
    'backup.c',
    'backup-dump.c',
 diff --git a/block/stream.c b/block/stream.c
-index e187cd1262..0b61029399 100644
+index d2da83ae7c..f941cba14e 100644
 --- a/block/stream.c
 +++ b/block/stream.c
 @@ -120,6 +120,40 @@ static int stream_prepare(Job *job)

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 bf143fac00..70d92966f7 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,

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 70d92966f7..931b513828 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,

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 931b513828..4ab9bb5e02 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 931b513828..4ab9bb5e02 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

debian/patches/pve/0042-alloc-track-error-out-when-auto-remove-is-not-set.patch

@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fiona Ebner <f.ebner@proxmox.com>
+Date: Tue, 26 Mar 2024 14:57:51 +0100
+Subject: [PATCH] alloc-track: error out when auto-remove is not set
+
+Since replacing the node now happens in the stream job, where the
+option cannot be read from (it's internal to the driver), it will
+always be treated as on.
+
+qemu-server will always set it, make sure to have other users notice
+the change (should they even exist). The option can be fully dropped
+in the future while adding a version guard in qemu-server.
+
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ block/alloc-track.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/block/alloc-track.c b/block/alloc-track.c
+index b9f8ea9137..f3ed2935c4 100644
+--- a/block/alloc-track.c
++++ b/block/alloc-track.c
+@@ -34,7 +34,6 @@ typedef struct {
+     BdrvDirtyBitmap *bitmap;
+     uint64_t granularity;
+     DropState drop_state;
+-    bool auto_remove;
+ } BDRVAllocTrackState;
+ 
+ static QemuOptsList runtime_opts = {
+@@ -86,7 +85,11 @@ static int track_open(BlockDriverState *bs, QDict *options, int flags,
+         goto fail;
+     }
+ 
+-    s->auto_remove = qemu_opt_get_bool(opts, TRACK_OPT_AUTO_REMOVE, false);
++    if (!qemu_opt_get_bool(opts, TRACK_OPT_AUTO_REMOVE, false)) {
++        error_setg(errp, "alloc-track: requires auto-remove option to be set to on");
++        ret = -EINVAL;
++        goto fail;
++    }
+ 
+     /* open the target (write) node, backing will be attached by block layer */
+     file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

debian/patches/pve/0043-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 8ada4d5832..f9f3b75284 100644
---- a/include/hw/boards.h
-+++ b/include/hw/boards.h
-@@ -636,42 +636,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)
-@@ -680,7 +704,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)
-@@ -689,7 +713,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

debian/patches/pve/0043-alloc-track-avoid-seemingly-superfluous-child-permis.patch

@@ -0,0 +1,84 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fiona Ebner <f.ebner@proxmox.com>
+Date: Wed, 27 Mar 2024 11:15:39 +0100
+Subject: [PATCH] alloc-track: avoid seemingly superfluous child permission
+ update
+
+Doesn't seem necessary nowadays (maybe after commit "alloc-track: fix
+deadlock during drop" where the dropping is not rescheduled and delayed
+anymore or some upstream change). Should there really be some issue,
+instead of having a drop state, this could also be just based off the
+fact whether there is still a backing child.
+
+Dumping the cumulative (shared) permissions for the BDS with a debug
+print yields the same values after this patch and with QEMU 8.1,
+namely 3 and 5.
+
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ block/alloc-track.c | 26 --------------------------
+ 1 file changed, 26 deletions(-)
+
+diff --git a/block/alloc-track.c b/block/alloc-track.c
+index f3ed2935c4..29138dcc49 100644
+--- a/block/alloc-track.c
++++ b/block/alloc-track.c
+@@ -25,15 +25,9 @@
+ 
+ #define TRACK_OPT_AUTO_REMOVE "auto-remove"
+ 
+-typedef enum DropState {
+-    DropNone,
+-    DropInProgress,
+-} DropState;
+-
+ typedef struct {
+     BdrvDirtyBitmap *bitmap;
+     uint64_t granularity;
+-    DropState drop_state;
+ } BDRVAllocTrackState;
+ 
+ static QemuOptsList runtime_opts = {
+@@ -137,8 +131,6 @@ static int track_open(BlockDriverState *bs, QDict *options, int flags,
+         goto fail;
+     }
+ 
+-    s->drop_state = DropNone;
+-
+ fail:
+     if (ret < 0) {
+         bdrv_graph_wrlock();
+@@ -289,18 +281,8 @@ track_child_perm(BlockDriverState *bs, BdrvChild *c, BdrvChildRole role,
+                  BlockReopenQueue *reopen_queue, uint64_t perm, uint64_t shared,
+                  uint64_t *nperm, uint64_t *nshared)
+ {
+-    BDRVAllocTrackState *s = bs->opaque;
+-
+     *nshared = BLK_PERM_ALL;
+ 
+-    /* in case we're currently dropping ourselves, claim to not use any
+-     * permissions at all - which is fine, since from this point on we will
+-     * never issue a read or write anymore */
+-    if (s->drop_state == DropInProgress) {
+-        *nperm = 0;
+-        return;
+-    }
+-
+     if (role & BDRV_CHILD_DATA) {
+         *nperm = perm & DEFAULT_PERM_PASSTHROUGH;
+     } else {
+@@ -326,14 +308,6 @@ track_co_change_backing_file(BlockDriverState *bs, const char *backing_file,
+      * kinda fits better, but in the long-term, a special parameter would be
+      * nice (or done via qemu-server via upcoming blockdev-replace QMP command).
+      */
+-    if (backing_file == NULL) {
+-        BDRVAllocTrackState *s = bs->opaque;
+-        bdrv_drained_begin(bs);
+-        s->drop_state = DropInProgress;
+-        bdrv_child_refresh_perms(bs, bs->file, &error_abort);
+-        bdrv_drained_end(bs);
+-    }
+-
+     return 0;
+ }
+ 

debian/patches/pve/0044-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 ccb97b6806..0f45af8bbe 100644
---- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -61,7 +61,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 {
-@@ -262,7 +261,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) {
-@@ -350,15 +348,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));
- }
- 
- /*

debian/patches/pve/0044-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);
+         }
+     }

debian/patches/pve/0045-Revert-hpet-store-full-64-bit-target-value-of-the-co.patch

@@ -1,202 +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 | 109 +++++++++++++++++++++++++++---------------------
- 1 file changed, 61 insertions(+), 48 deletions(-)
-
-diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
-index 0f45af8bbe..635a060d38 100644
---- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -56,7 +56,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.
-@@ -119,6 +118,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);
- }
-@@ -155,32 +159,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)
-@@ -256,12 +255,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)
-@@ -346,10 +340,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);
-+    }
- }
- 
- /*
-@@ -358,44 +356,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) {
-+    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 (!timer_is_periodic(t) && t->cmp64 > hpet_next_wrap(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)
-@@ -526,7 +534,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)) {

debian/patches/pve/0045-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)

debian/patches/pve/0046-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 635a060d38..5f4bb5667d 100644
---- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -421,7 +421,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);
-@@ -436,33 +435,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;
-@@ -476,11 +494,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) {
-@@ -492,12 +510,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
-@@ -505,7 +520,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);
-@@ -518,28 +534,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)) {
-@@ -547,7 +591,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();
-@@ -555,14 +602,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 =
-@@ -592,8 +637,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)) {
-@@ -605,7 +652,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();
-@@ -619,11 +674,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 c5b6db49f5..dd8a53c690 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"

debian/patches/pve/0046-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,

debian/patches/pve/0047-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 5f4bb5667d..5e3bf1f153 100644
---- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -494,7 +494,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);
-@@ -520,12 +520,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;
-@@ -606,8 +607,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 =
-@@ -641,9 +642,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);
-                 }
-             }

debian/patches/pve/0047-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 16d611c4ca..1963e47ab9 100644
+--- a/block/backup.c
++++ b/block/backup.c
+@@ -332,7 +332,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,
+@@ -433,7 +433,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 5e5dbc1da9..1054a69279 100644
+--- a/blockdev.c
++++ b/blockdev.c
+@@ -2727,7 +2727,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 cc1387ae02..f0c642b194 100644
+--- a/include/block/block_int-global-state.h
++++ b/include/block/block_int-global-state.h
+@@ -195,7 +195,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 f516d8e95a..d796d49abb 100644
+--- a/qapi/block-core.json
++++ b/qapi/block-core.json
+@@ -1849,6 +1849,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:
+@@ -1870,6 +1873,7 @@
+             '*on-target-error': 'BlockdevOnError',
+             '*auto-finalize': 'bool', '*auto-dismiss': 'bool',
+             '*filter-node-name': 'str',
++            '*discard-source': 'bool',
+             '*x-perf': { 'type': 'BackupPerf',
+                          'features': [ 'unstable' ] } } }
+ 

debian/patches/pve/0048-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 5e3bf1f153..daef12c8cf 100644
---- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -421,12 +421,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];
- 
-@@ -453,7 +453,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:
-@@ -494,14 +494,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];
- 
-@@ -603,7 +604,7 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
-         }
-         return;
-     } else {
--        switch (addr) {
-+        switch (index) {
-         case HPET_ID:
-             return;
-         case HPET_CFG:

debian/patches/pve/0048-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 7e3b378528..adb1cbb440 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 d796d49abb..edbf6e78b9 100644
+--- a/qapi/block-core.json
++++ b/qapi/block-core.json
+@@ -4930,12 +4930,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:

debian/patches/pve/0049-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 daef12c8cf..927263e2ff 100644
---- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -569,10 +569,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 dd8a53c690..2b81ee0812 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

debian/patches/pve/0049-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 edbf6e78b9..6e7ee87633 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:

debian/patches/pve/0050-PVE-backup-add-fleecing-option.patch

@@ -61,96 +61,17 @@ it has no parent, so just pass the one from the original bs.
 
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-[FE: improve error when cbw fails as reported by Friedrich Weber]
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
- block/copy-before-write.c      |  18 ++--
- block/copy-before-write.h      |   1 +
  block/monitor/block-hmp-cmds.c |   1 +
- pve-backup.c                   | 175 ++++++++++++++++++++++++++++++++-
- qapi/block-core.json           |  10 +-
- 5 files changed, 195 insertions(+), 10 deletions(-)
+ pve-backup.c                   | 143 ++++++++++++++++++++++++++++++++-
+ qapi/block-core.json           |  10 ++-
+ 3 files changed, 150 insertions(+), 4 deletions(-)
 
-diff --git a/block/copy-before-write.c b/block/copy-before-write.c
-index fd470f5f92..5c23b578ef 100644
---- a/block/copy-before-write.c
-+++ b/block/copy-before-write.c
-@@ -27,6 +27,7 @@
- #include "qobject/qjson.h"
- 
- #include "system/block-backend.h"
-+#include "qemu/atomic.h"
- #include "qemu/cutils.h"
- #include "qapi/error.h"
- #include "block/block_int.h"
-@@ -75,7 +76,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
--     * snapshot-API requests will fail with that error.
-+     * snapshot-API requests will fail with that error. To be accessed with
-+     * atomics.
-      */
-     int snapshot_error;
- } BDRVCopyBeforeWriteState;
-@@ -115,7 +117,7 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs,
-         return 0;
-     }
- 
--    if (s->snapshot_error) {
-+    if (qatomic_read(&s->snapshot_error)) {
-         return 0;
-     }
- 
-@@ -139,9 +141,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);
--            if (!s->snapshot_error) {
--                s->snapshot_error = ret;
--            }
-+            qatomic_cmpxchg(&s->snapshot_error, 0, ret);
-         } 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,
- 
-     QEMU_LOCK_GUARD(&s->lock);
- 
--    if (s->snapshot_error) {
-+    if (qatomic_read(&s->snapshot_error)) {
-         g_free(req);
-         return NULL;
-     }
-@@ -595,6 +595,12 @@ void bdrv_cbw_drop(BlockDriverState *bs)
-     bdrv_unref(bs);
- }
- 
-+int bdrv_cbw_snapshot_error(BlockDriverState *bs)
-+{
-+    BDRVCopyBeforeWriteState *s = bs->opaque;
-+    return qatomic_read(&s->snapshot_error);
-+}
-+
- static void cbw_init(void)
- {
-     bdrv_register(&bdrv_cbw_filter);
-diff --git a/block/copy-before-write.h b/block/copy-before-write.h
-index 2a5d4ba693..969da3620f 100644
---- a/block/copy-before-write.h
-+++ b/block/copy-before-write.h
-@@ -44,5 +44,6 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
-                                   BlockCopyState **bcs,
-                                   Error **errp);
- void bdrv_cbw_drop(BlockDriverState *bs);
-+int bdrv_cbw_snapshot_error(BlockDriverState *bs);
- 
- #endif /* COPY_BEFORE_WRITE_H */
 diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
-index 4f30f99644..66d16d342f 100644
+index 5000c084c5..70b3de4c7e 100644
 --- a/block/monitor/block-hmp-cmds.c
 +++ b/block/monitor/block-hmp-cmds.c
-@@ -1045,6 +1045,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
@@ -159,18 +80,22 @@ index 4f30f99644..66d16d342f 100644
  
      hmp_handle_error(mon, error);
 diff --git a/pve-backup.c b/pve-backup.c
-index 366b015589..9b66788ab5 100644
+index 9d480a8eec..7cc1dd3724 100644
 --- a/pve-backup.c
 +++ b/pve-backup.c
-@@ -7,6 +7,7 @@
- #include "system/blockdev.h"
+@@ -7,9 +7,11 @@
+ #include "sysemu/blockdev.h"
  #include "block/block_int-global-state.h"
  #include "block/blockjob.h"
 +#include "block/copy-before-write.h"
  #include "block/dirty-bitmap.h"
  #include "block/graph-lock.h"
  #include "qapi/qapi-commands-block.h"
-@@ -81,8 +82,15 @@ static void pvebackup_init(void)
++#include "qapi/qmp/qdict.h"
+ #include "qapi/qmp/qerror.h"
+ #include "qemu/cutils.h"
+ 
+@@ -81,8 +83,15 @@ static void pvebackup_init(void)
  // initialize PVEBackupState at startup
  opts_init(pvebackup_init);
  
@@ -186,12 +111,20 @@ index 366b015589..9b66788ab5 100644
      size_t size;
      uint64_t block_size;
      uint8_t dev_id;
-@@ -352,11 +360,44 @@ static void coroutine_fn pvebackup_co_complete_stream(void *opaque)
-     qemu_co_mutex_unlock(&backup_state.backup_mutex);
- }
+@@ -355,6 +364,25 @@ static void pvebackup_complete_cb(void *opaque, int ret)
+     PVEBackupDevInfo *di = opaque;
+     di->completed_ret = ret;
  
-+static void cleanup_snapshot_access(PVEBackupDevInfo *di)
-+{
++    /*
++     * 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.
++     *
++     * Note that the AioContext lock is already acquired by our caller, i.e.
++     * job_finalize_single_locked()
++     */
 +    if (di->fleecing.snapshot_access) {
 +        bdrv_unref(di->fleecing.snapshot_access);
 +        di->fleecing.snapshot_access = NULL;
@@ -200,104 +133,11 @@ index 366b015589..9b66788ab5 100644
 +        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
-+         * error, making further requests to the snapshot fail with EACCES, which then also fail the
-+         * job. But that code is not the root cause and just confusing, so update it.
-+         */
-+        int snapshot_error = bdrv_cbw_snapshot_error(di->fleecing.cbw);
-+        if (di->completed_ret == -EACCES && snapshot_error) {
-+            di->completed_ret = snapshot_error;
-+        }
-+    }
-+
-+    /*
-+     * 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.
       */
-@@ -487,6 +528,65 @@ 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) {
-+        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;
-+    }
-+
-+    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.
-@@ -523,9 +623,42 @@ static void create_backup_jobs_bh(void *opaque) {
+@@ -522,9 +550,82 @@ static void create_backup_jobs_bh(void *opaque) {
          }
          bdrv_drained_begin(di->bs);
  
@@ -305,15 +145,55 @@ index 366b015589..9b66788ab5 100644
 +
 +        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, "%s - setting up snapshot access for fleecing failed: %s",
-+                           di->device_name,
++            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));
++
++            /*
++             * Holding the AioContext lock here would cause a deadlock, because bdrv_open_driver()
++             * will aquire it a second time. But it's allowed to be held exactly once when polling
++             * and that happens when the bdrv_refresh_total_sectors() call is made there.
++             */
++            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");
++                break;
++            }
 +            source_bs = di->fleecing.snapshot_access;
 +            discard_source = true;
 +
@@ -337,20 +217,12 @@ index 366b015589..9b66788ab5 100644
          BlockJob *job = backup_job_create(
 -            NULL, di->bs, di->target, backup_state.speed, sync_mode, di->bitmap,
 -            bitmap_mode, false, NULL, &backup_state.perf, BLOCKDEV_ON_ERROR_REPORT,
-+            di->device_name, source_bs, di->target, backup_state.speed, sync_mode, di->bitmap,
++            job_id, 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);
  
-@@ -539,6 +672,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;
-@@ -581,6 +715,14 @@ static void create_backup_jobs_bh(void *opaque) {
+@@ -580,6 +681,14 @@ static void create_backup_jobs_bh(void *opaque) {
      aio_co_enter(data->ctx, data->co);
  }
  
@@ -365,7 +237,7 @@ index 366b015589..9b66788ab5 100644
  /*
   * 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
-@@ -588,6 +730,7 @@ static void create_backup_jobs_bh(void *opaque) {
+@@ -587,6 +696,7 @@ static void create_backup_jobs_bh(void *opaque) {
   */
  static GList coroutine_fn GRAPH_RDLOCK *get_device_info(
      const char *devlist,
@@ -373,10 +245,11 @@ index 366b015589..9b66788ab5 100644
      Error **errp)
  {
      gchar **devs = NULL;
-@@ -613,6 +756,30 @@ static GList coroutine_fn GRAPH_RDLOCK *get_device_info(
+@@ -610,6 +720,31 @@ 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);
 +                BlockBackend *fleecing_blk = blk_by_name(fleecing_devid);
@@ -387,7 +260,7 @@ index 366b015589..9b66788ab5 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;
 +                }
 +                /*
@@ -404,7 +277,7 @@ index 366b015589..9b66788ab5 100644
              di_list = g_list_append(di_list, di);
              d++;
          }
-@@ -663,6 +830,7 @@ UuidInfo coroutine_fn *qmp_backup(
+@@ -659,6 +794,7 @@ UuidInfo coroutine_fn *qmp_backup(
      const char *devlist,
      bool has_speed, int64_t speed,
      bool has_max_workers, int64_t max_workers,
@@ -412,7 +285,7 @@ index 366b015589..9b66788ab5 100644
      Error **errp)
  {
      assert(qemu_in_coroutine());
-@@ -691,7 +859,7 @@ UuidInfo coroutine_fn *qmp_backup(
+@@ -687,7 +823,7 @@ UuidInfo coroutine_fn *qmp_backup(
      format = has_format ? format : BACKUP_FORMAT_VMA;
  
      bdrv_graph_co_rdlock();
@@ -421,7 +294,7 @@ index 366b015589..9b66788ab5 100644
      bdrv_graph_co_rdunlock();
      if (local_err) {
          error_propagate(errp, local_err);
-@@ -1093,5 +1261,6 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
+@@ -1095,5 +1231,6 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
      ret->query_bitmap_info = true;
      ret->pbs_masterkey = true;
      ret->backup_max_workers = true;
@@ -429,10 +302,10 @@ index 366b015589..9b66788ab5 100644
      return ret;
  }
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 6838187607..9bdcfa31ea 100644
+index 6e7ee87633..dc5f75cd39 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -952,6 +952,10 @@
+@@ -948,6 +948,10 @@
  #
  # @max-workers: see @BackupPerf for details. Default 16.
  #
@@ -443,7 +316,7 @@ index 6838187607..9bdcfa31ea 100644
  # Returns: the uuid of the backup job
  #
  ##
-@@ -972,7 +976,8 @@
+@@ -968,7 +972,8 @@
                                      '*firewall-file': 'str',
                                      '*devlist': 'str',
                                      '*speed': 'int',
@@ -453,7 +326,7 @@ index 6838187607..9bdcfa31ea 100644
    'returns': 'UuidInfo', 'coroutine': true }
  
  ##
-@@ -1018,6 +1023,8 @@
+@@ -1014,6 +1019,8 @@
  #
  # @pbs-library-version: Running version of libproxmox-backup-qemu0 library.
  #
@@ -462,7 +335,7 @@ index 6838187607..9bdcfa31ea 100644
  # @backup-max-workers: Whether the 'max-workers' @BackupPerf setting is
  #     supported or not.
  #
-@@ -1029,6 +1036,7 @@
+@@ -1025,6 +1032,7 @@
              'pbs-dirty-bitmap-migration': 'bool',
              'pbs-masterkey': 'bool',
              'pbs-library-version': 'str',

debian/patches/pve/0050-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 927263e2ff..5aae09f166 100644
---- a/hw/timer/hpet.c
-+++ b/hw/timer/hpet.c
-@@ -199,31 +199,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]);
-     }
- }
- 
-@@ -408,13 +398,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,
-@@ -514,26 +499,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
-@@ -611,10 +590,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. */

debian/patches/pve/0051-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 9b66788ab5..588ee98ffc 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) {

debian/patches/pve/0051-PVE-backup-improve-error-when-copy-before-write-fail.patch

@@ -0,0 +1,117 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fiona Ebner <f.ebner@proxmox.com>
+Date: Mon, 29 Apr 2024 14:43:58 +0200
+Subject: [PATCH] PVE backup: improve error when copy-before-write fails for
+ fleecing
+
+With fleecing, failure for copy-before-write does not fail the guest
+write, but only sets the snapshot error that is associated to the
+copy-before-write filter, making further requests to the snapshot
+access fail with EACCES, which then also fails the job. But that error
+code is not the root cause of why the backup failed, so bubble up the
+original snapshot error instead.
+
+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 | 18 ++++++++++++------
+ block/copy-before-write.h |  1 +
+ pve-backup.c              |  9 +++++++++
+ 3 files changed, 22 insertions(+), 6 deletions(-)
+
+diff --git a/block/copy-before-write.c b/block/copy-before-write.c
+index bba58326d7..50cc4c7aae 100644
+--- a/block/copy-before-write.c
++++ b/block/copy-before-write.c
+@@ -27,6 +27,7 @@
+ #include "qapi/qmp/qjson.h"
+ 
+ #include "sysemu/block-backend.h"
++#include "qemu/atomic.h"
+ #include "qemu/cutils.h"
+ #include "qapi/error.h"
+ #include "block/block_int.h"
+@@ -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
+-     * snapshot-API requests will fail with that error.
++     * snapshot-API requests will fail with that error. To be accessed with
++     * atomics.
+      */
+     int snapshot_error;
+ } BDRVCopyBeforeWriteState;
+@@ -114,7 +116,7 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs,
+         return 0;
+     }
+ 
+-    if (s->snapshot_error) {
++    if (qatomic_read(&s->snapshot_error)) {
+         return 0;
+     }
+ 
+@@ -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);
+-            if (!s->snapshot_error) {
+-                s->snapshot_error = ret;
+-            }
++            qatomic_cmpxchg(&s->snapshot_error, 0, ret);
+         } else {
+             bdrv_set_dirty_bitmap(s->done_bitmap, off, end - off);
+         }
+@@ -214,7 +214,7 @@ cbw_snapshot_read_lock(BlockDriverState *bs, int64_t offset, int64_t bytes,
+ 
+     QEMU_LOCK_GUARD(&s->lock);
+ 
+-    if (s->snapshot_error) {
++    if (qatomic_read(&s->snapshot_error)) {
+         g_free(req);
+         return NULL;
+     }
+@@ -585,6 +585,12 @@ void bdrv_cbw_drop(BlockDriverState *bs)
+     bdrv_unref(bs);
+ }
+ 
++int bdrv_cbw_snapshot_error(BlockDriverState *bs)
++{
++    BDRVCopyBeforeWriteState *s = bs->opaque;
++    return qatomic_read(&s->snapshot_error);
++}
++
+ static void cbw_init(void)
+ {
+     bdrv_register(&bdrv_cbw_filter);
+diff --git a/block/copy-before-write.h b/block/copy-before-write.h
+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,
+                                   BlockCopyState **bcs,
+                                   Error **errp);
+ void bdrv_cbw_drop(BlockDriverState *bs);
++int bdrv_cbw_snapshot_error(BlockDriverState *bs);
+ 
+ #endif /* COPY_BEFORE_WRITE_H */
+diff --git a/pve-backup.c b/pve-backup.c
+index 7cc1dd3724..07709aa350 100644
+--- a/pve-backup.c
++++ b/pve-backup.c
+@@ -379,6 +379,15 @@ static void pvebackup_complete_cb(void *opaque, int ret)
+         di->fleecing.snapshot_access = NULL;
+     }
+     if (di->fleecing.cbw) {
++        /*
++         * With fleecing, failure for cbw does not fail the guest write, but only sets the snapshot
++         * error, making further requests to the snapshot fail with EACCES, which then also fail the
++         * job. But that code is not the root cause and just confusing, so update it.
++         */
++        int snapshot_error = bdrv_cbw_snapshot_error(di->fleecing.cbw);
++        if (di->completed_ret == -EACCES && snapshot_error) {
++            di->completed_ret = snapshot_error;
++        }
+         bdrv_cbw_drop(di->fleecing.cbw);
+         di->fleecing.cbw = NULL;
+     }

debian/patches/pve/0052-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 588ee98ffc..3be9930ad3 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;

debian/patches/pve/0053-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 3be9930ad3..87778f7e76 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));

debian/patches/pve/0054-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 87778f7e76..bd81621d51 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);

debian/patches/pve/0055-PVE-backup-implement-backup-access-setup-and-teardow.patch

@@ -1,898 +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.
-
-There can be one dirty bitmap for each backup target ID for each
-device (which are tracked in the backup_access_bitmaps hash table).
-The QMP user can specify the ID of the bitmap it likes to use. This ID
-is then compared to the current one for the given target and device.
-If they match, the bitmap is re-used (should it still exist on the
-drive, otherwise re-created). If there is a mismatch, the old bitmap
-is removed and a new one is created.
-
-The return value of the QMP command includes information about what
-bitmap action was taken. Similar to what the query-backup QMP command
-returns for regular backup. It also includes the bitmap name and
-associated block node, so the management layer can then set up an NBD
-export with the bitmap.
-
-While the backup access is active, a background bitmap is also
-required. This is necessary to implement bitmap handling according to
-the original reference [0]. In particular:
-
-- in the error case, new writes since the backup access was set up are
-  in the background bitmap. Because of failure, the previously tracked
-  writes from the backup access bitmap are still required too. Thus,
-  the bitmap is merged with the background bitmap to get all new
-  writes since the last backup.
-
-- in the success case, continue tracking for the next incremental
-  backup in the backup access bitmap. New writes since the backup
-  access was set up are in the background bitmap. Because the backup
-  was successfully, clear the backup access bitmap and merge back the
-  background bitmap to get only the new writes.
-
-Since QEMU cannot know if the backup was successful or not (except if
-failure already happens during the setup QMP command), the management
-layer needs to tell it via the teardown QMP command.
-
-The bitmap action is also recorded in the device info now.
-
-The backup-access api keeps track of what bitmap names got used for
-which devices and thus knows when a bitmap went missing. Propagate
-this information to the QMP user with a new 'missing-recreated'
-variant for the taken bitmap action.
-
-[0]: https://lore.kernel.org/qemu-devel/b68833dd-8864-4d72-7c61-c134a9835036@ya.ru/
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Reviewed-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
----
- pve-backup.c         | 519 +++++++++++++++++++++++++++++++++++++++----
- pve-backup.h         |  16 ++
- qapi/block-core.json |  99 ++++++++-
- system/runstate.c    |   6 +
- 4 files changed, 596 insertions(+), 44 deletions(-)
- create mode 100644 pve-backup.h
-
-diff --git a/pve-backup.c b/pve-backup.c
-index bd81621d51..0450303017 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"
-@@ -14,6 +15,7 @@
- #include "qobject/qdict.h"
- #include "qapi/qmp/qerror.h"
- #include "qemu/cutils.h"
-+#include "qemu/error-report.h"
- 
- #if defined(CONFIG_MALLOC_TRIM)
- #include <malloc.h>
-@@ -40,6 +42,7 @@
-  */
- 
- const char *PBS_BITMAP_NAME = "pbs-incremental-dirty-bitmap";
-+const char *BACKGROUND_BITMAP_NAME = "backup-access-background-bitmap";
- 
- static struct PVEBackupState {
-     struct {
-@@ -98,8 +101,11 @@ typedef struct PVEBackupDevInfo {
-     char* device_name;
-     int completed_ret; // INT_MAX if not completed
-     BdrvDirtyBitmap *bitmap;
-+    BdrvDirtyBitmap *background_bitmap; // used for external backup access
-+    PBSBitmapAction bitmap_action;
-     BlockDriverState *target;
-     BlockJob *job;
-+    BackupAccessSetupBitmapMode requested_bitmap_mode;
- } PVEBackupDevInfo;
- 
- static void pvebackup_propagate_error(Error *err)
-@@ -361,6 +367,67 @@ static void coroutine_fn pvebackup_co_complete_stream(void *opaque)
-     qemu_co_mutex_unlock(&backup_state.backup_mutex);
- }
- 
-+/*
-+ * New writes since the backup access was set up are in the background bitmap. Because of failure,
-+ * the previously tracked writes in di->bitmap are still required too. Thus, merge with the
-+ * background bitmap to get all new writes since the last backup.
-+ */
-+static void handle_backup_access_bitmaps_in_error_case(PVEBackupDevInfo *di)
-+{
-+    Error *local_err = NULL;
-+
-+    if (di->bs && di->background_bitmap) {
-+        bdrv_drained_begin(di->bs);
-+        if (di->bitmap) {
-+            bdrv_enable_dirty_bitmap(di->bitmap);
-+            if (!bdrv_merge_dirty_bitmap(di->bitmap, di->background_bitmap, NULL, &local_err)) {
-+                warn_report("backup access: %s - could not merge bitmaps in error path - %s",
-+                            di->device_name,
-+                            local_err ? error_get_pretty(local_err) : "unknown error");
-+                /*
-+                 * Could not merge, drop original bitmap too.
-+                 */
-+                bdrv_release_dirty_bitmap(di->bitmap);
-+            }
-+        } else {
-+            warn_report("backup access: %s - expected bitmap not present", di->device_name);
-+        }
-+        bdrv_release_dirty_bitmap(di->background_bitmap);
-+        bdrv_drained_end(di->bs);
-+    }
-+}
-+
-+/*
-+ * Continue tracking for next incremental backup in di->bitmap. New writes since the backup access
-+ * was set up are in the background bitmap. Because the backup was successful, clear di->bitmap and
-+ * merge back the background bitmap to get only the new writes.
-+ */
-+static void handle_backup_access_bitmaps_after_success(PVEBackupDevInfo *di)
-+{
-+    Error *local_err = NULL;
-+
-+    if (di->bs && di->background_bitmap) {
-+        bdrv_drained_begin(di->bs);
-+        if (di->bitmap) {
-+            bdrv_enable_dirty_bitmap(di->bitmap);
-+            bdrv_clear_dirty_bitmap(di->bitmap, NULL);
-+            if (!bdrv_merge_dirty_bitmap(di->bitmap, di->background_bitmap, NULL, &local_err)) {
-+                warn_report("backup access: %s - could not merge bitmaps after backup - %s",
-+                            di->device_name,
-+                            local_err ? error_get_pretty(local_err) : "unknown error");
-+                /*
-+                 * Could not merge, drop original bitmap too.
-+                 */
-+                bdrv_release_dirty_bitmap(di->bitmap);
-+            }
-+        } else {
-+            warn_report("backup access: %s - expected bitmap not present", di->device_name);
-+        }
-+        bdrv_release_dirty_bitmap(di->background_bitmap);
-+        bdrv_drained_end(di->bs);
-+    }
-+}
-+
- static void cleanup_snapshot_access(PVEBackupDevInfo *di)
- {
-     if (di->fleecing.snapshot_access) {
-@@ -588,6 +655,51 @@ 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 (di->bitmap) {
-+            BdrvDirtyBitmap *background_bitmap =
-+                bdrv_create_dirty_bitmap(di->bs, PROXMOX_BACKUP_DEFAULT_CHUNK_SIZE,
-+                                         BACKGROUND_BITMAP_NAME, &local_err);
-+            if (!background_bitmap) {
-+                error_setg(errp, "%s - creating background bitmap for backup access failed: %s",
-+                           di->device_name,
-+                           local_err ? error_get_pretty(local_err) : "unknown error");
-+                bdrv_drained_end(di->bs);
-+                break;
-+            }
-+            di->background_bitmap = background_bitmap;
-+            bdrv_disable_dirty_bitmap(di->bitmap);
-+        }
-+
-+        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 +836,62 @@ 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;
-+}
-+
-+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
-@@ -742,45 +910,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);
--                goto err;
--            }
--            BlockDriverState *bs = blk_bs(blk);
--            if (!bdrv_co_is_inserted(bs)) {
--                error_setg(errp, "Device '%s' has no medium", *d);
-+            PVEBackupDevInfo *di = get_single_device_info(*d, device_uses_fleecing, errp);
-+            if (!di) {
-                 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++;
-         }
-@@ -839,8 +972,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 +989,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 +1014,299 @@ 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,
-+    BackupAccessSourceDeviceList *devices,
-+    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();
-+    for (BackupAccessSourceDeviceList *it = devices; it; it = it->next) {
-+        PVEBackupDevInfo *di = get_single_device_info(it->value->device, fleecing_all, &local_err);
-+        if (!di) {
-+            bdrv_graph_co_rdunlock();
-+            error_propagate(errp, local_err);
-+            goto err;
-+        }
-+        di->requested_bitmap_mode = it->value->bitmap_mode;
-+        di_list = g_list_append(di_list, di);
-+    }
-+    bdrv_graph_co_rdunlock();
-+    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();
-+
-+    const char *bitmap_name = target_id;
-+
-+    /* create bitmaps if requested */
-+    l = di_list;
-+    while (l) {
-+        PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
-+        l = g_list_next(l);
-+
-+        di->block_size = PROXMOX_BACKUP_DEFAULT_CHUNK_SIZE;
-+
-+        PBSBitmapAction action = PBS_BITMAP_ACTION_NOT_USED;
-+        size_t dirty = di->size;
-+
-+        if (di->requested_bitmap_mode == BACKUP_ACCESS_SETUP_BITMAP_MODE_NONE ||
-+            di->requested_bitmap_mode == BACKUP_ACCESS_SETUP_BITMAP_MODE_NEW) {
-+            BdrvDirtyBitmap *old_bitmap = bdrv_find_dirty_bitmap(di->bs, bitmap_name);
-+            if (old_bitmap) {
-+                bdrv_release_dirty_bitmap(old_bitmap);
-+                action = PBS_BITMAP_ACTION_NOT_USED_REMOVED; // set below for new
-+            }
-+        }
-+
-+        BdrvDirtyBitmap *bitmap = NULL;
-+        if (di->requested_bitmap_mode == BACKUP_ACCESS_SETUP_BITMAP_MODE_NEW ||
-+            di->requested_bitmap_mode == BACKUP_ACCESS_SETUP_BITMAP_MODE_USE) {
-+            bitmap = bdrv_find_dirty_bitmap(di->bs, bitmap_name);
-+            if (!bitmap) {
-+                bitmap = bdrv_create_dirty_bitmap(di->bs, PROXMOX_BACKUP_DEFAULT_CHUNK_SIZE,
-+                                                  bitmap_name, errp);
-+                if (!bitmap) {
-+                    qemu_mutex_unlock(&backup_state.stat.lock);
-+                    goto err;
-+                }
-+                bdrv_set_dirty_bitmap(bitmap, 0, di->size);
-+                if (di->requested_bitmap_mode == BACKUP_ACCESS_SETUP_BITMAP_MODE_USE) {
-+                    action = PBS_BITMAP_ACTION_MISSING_RECREATED;
-+                } else {
-+                    action = PBS_BITMAP_ACTION_NEW;
-+                }
-+            } else {
-+                if (di->requested_bitmap_mode == BACKUP_ACCESS_SETUP_BITMAP_MODE_NEW) {
-+                    qemu_mutex_unlock(&backup_state.stat.lock);
-+                    error_setg(errp, "internal error - removed old bitmap still present");
-+                    goto err;
-+                }
-+                /* track clean chunks as reused */
-+                dirty = MIN(bdrv_get_dirty_count(bitmap), di->size);
-+                backup_state.stat.reused += di->size - dirty;
-+                action = PBS_BITMAP_ACTION_USED;
-+            }
-+        }
-+
-+        PBSBitmapInfo *info = g_malloc(sizeof(*info));
-+        info->drive = g_strdup(di->device_name);
-+        info->action = action;
-+        info->size = di->size;
-+        info->dirty = dirty;
-+        backup_state.stat.bitmap_list = g_list_append(backup_state.stat.bitmap_list, info);
-+
-+        di->bitmap = bitmap;
-+        di->bitmap_action = action;
-+    }
-+
-+    /* 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;
-+        if (di->bitmap) {
-+            info->value->bitmap_node_name = g_strdup(bdrv_get_node_name(di->bs));
-+            info->value->bitmap_name = g_strdup(bitmap_name);
-+            info->value->bitmap_action = di->bitmap_action;
-+            info->value->has_bitmap_action = true;
-+        }
-+
-+        *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);
-+
-+        handle_backup_access_bitmaps_in_error_case(di);
-+
-+        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(bool success)
-+{
-+    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;
-+        }
-+
-+        if (success) {
-+            handle_backup_access_bitmaps_after_success(di);
-+        } else {
-+            handle_backup_access_bitmaps_in_error_case(di);
-+        }
-+
-+        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(*((bool*)data->data));
-+
-+    /* return */
-+    aio_co_enter(data->ctx, data->co);
-+}
-+
-+void coroutine_fn qmp_backup_access_teardown(const char *target_id, bool success, 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(),
-+        .data = &success,
-+    };
-+    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,
-@@ -1068,6 +1499,7 @@ UuidInfo coroutine_fn *qmp_backup(
-             }
- 
-             di->dev_id = dev_id;
-+            di->bitmap_action = action;
- 
-             PBSBitmapInfo *info = g_malloc(sizeof(*info));
-             info->drive = g_strdup(di->device_name);
-@@ -1119,7 +1551,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 +1730,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..9ebeef7c8f
---- /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(bool success);
-+
-+#endif /* PVE_BACKUP_H */
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 9bdcfa31ea..2fb51215f2 100644
---- a/qapi/block-core.json
-+++ b/qapi/block-core.json
-@@ -1023,6 +1023,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
-@@ -1036,6 +1039,7 @@
-             'pbs-dirty-bitmap-migration': 'bool',
-             'pbs-masterkey': 'bool',
-             'pbs-library-version': 'str',
-+            'backup-access-api': 'bool',
-             'backup-fleecing': 'bool',
-             'backup-max-workers': 'bool' } }
- 
-@@ -1067,9 +1071,16 @@
- #           base snapshot did not match the base given for the current job or
- #           the crypt mode has changed.
- #
-+# @missing-recreated: A bitmap for incremental backup was expected to be
-+#     present, but was missing and thus got recreated. For example, this can
-+#     happen if the drive was re-attached or if the bitmap was deleted for some
-+#     other reason. PBS does not currently keep track of this; the backup-access
-+#     mechanism does.
-+#
- ##
- { 'enum': 'PBSBitmapAction',
--  'data': ['not-used', 'not-used-removed', 'new', 'used', 'invalid'] }
-+  'data': ['not-used', 'not-used-removed', 'new', 'used', 'invalid',
-+           'missing-recreated'] }
- 
- ##
- # @PBSBitmapInfo:
-@@ -1102,6 +1113,92 @@
- ##
- { '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.
-+#
-+# @bitmap-node-name: the block node name the dirty bitmap is associated to.
-+#
-+# @bitmap-name: the name of the dirty bitmap associated to the backup access.
-+#
-+# @bitmap-action: the action taken on the dirty bitmap.
-+#
-+##
-+{ 'struct': 'BackupAccessInfo',
-+  'data': { 'node-name': 'str', 'device': 'str', 'size': 'size',
-+            '*bitmap-node-name': 'str', '*bitmap-name': 'str',
-+            '*bitmap-action': 'PBSBitmapAction' } }
-+
-+##
-+# @BackupAccessSourceDevice:
-+#
-+# Source block device information for creating a backup access.
-+#
-+# @device: the block device name.
-+#
-+# @bitmap-mode: used to control whether the bitmap should be reused or
-+#     recreated or not used. Default is not using a bitmap.
-+#
-+##
-+{ 'struct': 'BackupAccessSourceDevice',
-+  'data': { 'device': 'str', '*bitmap-mode': 'BackupAccessSetupBitmapMode' } }
-+
-+##
-+# @BackupAccessSetupBitmapMode:
-+#
-+# How to setup a bitmap for a device for @backup-access-setup.
-+#
-+# @none: do not use a bitmap. Removes an existing bitmap if present.
-+#
-+# @new: create and use a new bitmap.
-+#
-+# @use: try to re-use an existing bitmap. Create a new one if it doesn't exist.
-+##
-+{ 'enum': 'BackupAccessSetupBitmapMode',
-+  'data': ['none', 'new', 'use' ] }
-+
-+##
-+# @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.
-+#
-+# @devices: list of devices for which to create the backup access.  Also
-+#     controls whether to use/create a bitmap for the device.  Check the
-+#     @bitmap-action in the result to see what action was actually taken for the
-+#     bitmap.  Each target controls its own bitmaps.
-+#
-+# Returns: a list of @BackupAccessInfo, one for each device.
-+#
-+##
-+{ 'command': 'backup-access-setup',
-+  'data': { 'target-id': 'str', 'devices': [ 'BackupAccessSourceDevice' ] },
-+  '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.
-+#
-+# @success: whether the backup done by the external provider was successful.
-+#
-+##
-+{ 'command': 'backup-access-teardown',
-+  'data': { 'target-id': 'str', 'success': 'bool' },
-+  'coroutine': true }
-+
- ##
- # @BlockDeviceTimedStats:
- #
-diff --git a/system/runstate.c b/system/runstate.c
-index 272801d307..cf775213bd 100644
---- a/system/runstate.c
-+++ b/system/runstate.c
-@@ -60,6 +60,7 @@
- #include "system/system.h"
- #include "system/tpm.h"
- #include "trace.h"
-+#include "pve-backup.h"
- 
- static NotifierList exit_notifiers =
-     NOTIFIER_LIST_INITIALIZER(exit_notifiers);
-@@ -921,6 +922,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(false);
-     job_cancel_sync_all();
-     bdrv_close_all();
- 

debian/patches/pve/0056-PVE-backup-prepare-for-the-switch-to-using-blockdev-.patch

@@ -1,106 +0,0 @@
-From 5a8cf9e98ba1668a6a20c2fcda1704de4103ff58 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 2 Jul 2025 18:27:34 +0200
-Subject: [PATCH 56/59] PVE backup: prepare for the switch to using blockdev
- rather than drive
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Also allow finding block nodes by their node name rather than just via
-an associated block backend, which might not exist for block nodes.
-
-For regular drives, it is essential to not use the throttle group,
-because otherwise the limits intended only for the guest would also
-apply to the backup job.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- pve-backup.c | 51 +++++++++++++++++++++++++++++++++++++++------------
- 1 file changed, 39 insertions(+), 12 deletions(-)
-
-diff --git a/pve-backup.c b/pve-backup.c
-index 0450303017..457fcb7e5c 100644
---- a/pve-backup.c
-+++ b/pve-backup.c
-@@ -847,29 +847,56 @@ static PVEBackupDevInfo coroutine_fn GRAPH_RDLOCK *get_single_device_info(
-     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 *root_bs, *bs;
-+
-+    if (blk) {
-+        root_bs = bs = blk_bs(blk);
-+    } else {
-+        /* TODO PVE 10 - fleecing will always be attached without blk */
-+        root_bs = bs = bdrv_find_node(device);
-+        if (!bs) {
-+            error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
-+                      "Device '%s' not found", device);
-+            return NULL;
-+        }
-+        /* For TPM, bs is already correct, otherwise need the file child. */
-+        if (!strncmp(bs->drv->format_name, "throttle", 8)) {
-+            if (!bs->file || !bs->file->bs) {
-+                error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
-+                          "Device '%s' not found (no file child)", device);
-+                return NULL;
-+            }
-+            bs = bs->file->bs;
-+        }
-     }
--    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));
-+    /* Need the name of the root node, e.g. drive-scsi0 */
-+    di->device_name = g_strdup(bdrv_get_device_or_node_name(root_bs));
- 
-     if (device_uses_fleecing && device_uses_fleecing(device)) {
-         g_autofree gchar *fleecing_devid = g_strconcat(device, "-fleecing", NULL);
-+        BlockDriverState *fleecing_bs;
-+
-         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;
-+        if (fleecing_blk) {
-+            fleecing_bs = blk_bs(fleecing_blk);
-+        } else {
-+            /* TODO PVE 10 - fleecing will always be attached without blk */
-+            fleecing_bs = bdrv_find_node(fleecing_devid);
-+            if (!fleecing_bs) {
-+                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;
-@@ -927,7 +954,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->device_name = g_strdup(bdrv_get_device_or_node_name(bs));
-             di_list = g_list_append(di_list, di);
-         }
-     }
--- 
-2.39.5
-

debian/patches/pve/0057-block-zeroinit-support-using-as-blockdev-driver.patch

@@ -1,71 +0,0 @@
-From 5beb1f48555d74f468b6c0ca657d3be44c8ea8e3 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 2 Jul 2025 18:27:35 +0200
-Subject: [PATCH 57/59] block/zeroinit: support using as blockdev driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- block/zeroinit.c     | 12 +++++++++---
- qapi/block-core.json |  5 +++--
- 2 files changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/block/zeroinit.c b/block/zeroinit.c
-index f9d513db15..036edb17f5 100644
---- a/block/zeroinit.c
-+++ b/block/zeroinit.c
-@@ -66,6 +66,7 @@ static int zeroinit_open(BlockDriverState *bs, QDict *options, int flags,
-     QemuOpts *opts;
-     Error *local_err = NULL;
-     int ret;
-+    const char *next = NULL;
- 
-     s->extents = 0;
- 
-@@ -77,9 +78,14 @@ static int zeroinit_open(BlockDriverState *bs, QDict *options, int flags,
-         goto fail;
-     }
- 
--    /* Open the raw file */
--    ret = bdrv_open_file_child(qemu_opt_get(opts, "x-next"), options, "next",
--                               bs, &local_err);
-+
-+    next = qemu_opt_get(opts, "x-next");
-+
-+    if (next) {
-+        ret = bdrv_open_file_child(next, options, "next", bs, &local_err);
-+    } else { /* when opened as a blockdev, there is no 'next' option */
-+        ret = bdrv_open_file_child(NULL, options, "file", bs, &local_err);
-+    }
-     if (ret < 0) {
-         error_propagate(errp, local_err);
-         goto fail;
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 2fb51215f2..f8ed564cf0 100644
---- a/qapi/block-core.json
-+++ b/qapi/block-core.json
-@@ -3586,7 +3586,7 @@
-             { 'name': 'virtio-blk-vfio-pci', 'if': 'CONFIG_BLKIO' },
-             { 'name': 'virtio-blk-vhost-user', 'if': 'CONFIG_BLKIO' },
-             { 'name': 'virtio-blk-vhost-vdpa', 'if': 'CONFIG_BLKIO' },
--            'vmdk', 'vpc', 'vvfat' ] }
-+            'vmdk', 'vpc', 'vvfat', 'zeroinit' ] }
- 
- ##
- # @BlockdevOptionsFile:
-@@ -5172,7 +5172,8 @@
-                       'if': 'CONFIG_BLKIO' },
-       'vmdk':       'BlockdevOptionsGenericCOWFormat',
-       'vpc':        'BlockdevOptionsGenericFormat',
--      'vvfat':      'BlockdevOptionsVVFAT'
-+      'vvfat':      'BlockdevOptionsVVFAT',
-+      'zeroinit':   'BlockdevOptionsGenericFormat'
-   } }
- 
- ##
--- 
-2.39.5
-

debian/patches/pve/0058-block-alloc-track-support-using-as-blockdev-driver.patch

@@ -1,61 +0,0 @@
-From d180b059731818ae34e43e11495c8ac081ab89b9 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 2 Jul 2025 18:27:36 +0200
-Subject: [PATCH 58/59] block/alloc-track: support using as blockdev driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- qapi/block-core.json | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index f8ed564cf0..07c5773717 100644
---- a/qapi/block-core.json
-+++ b/qapi/block-core.json
-@@ -3567,7 +3567,8 @@
- # Since: 2.9
- ##
- { 'enum': 'BlockdevDriver',
--  'data': [ 'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs',
-+  'data': [ 'alloc-track',
-+            'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs',
-             'cloop', 'compress', 'copy-before-write', 'copy-on-read', 'dmg',
-             'file', 'snapshot-access', 'ftp', 'ftps',
-             {'name': 'gluster', 'features': [ 'deprecated' ] },
-@@ -3668,6 +3669,21 @@
- { 'struct': 'BlockdevOptionsNull',
-   'data': { '*size': 'int', '*latency-ns': 'uint64', '*read-zeroes': 'bool' } }
- 
-+##
-+# @BlockdevOptionsAllocTrack:
-+#
-+# Driver specific block device options for the alloc-track backend.
-+#
-+# @backing: backing file with the data.
-+#
-+# @auto-remove: whether the alloc-track driver should drop itself
-+#     after completing the stream.
-+#
-+##
-+{ 'struct': 'BlockdevOptionsAllocTrack',
-+  'base': 'BlockdevOptionsGenericFormat',
-+  'data': { 'auto-remove': 'bool', 'backing': 'BlockdevRefOrNull' } }
-+
- ##
- # @BlockdevOptionsPbs:
- #
-@@ -5114,6 +5130,7 @@
-             '*detect-zeroes': 'BlockdevDetectZeroesOptions' },
-   'discriminator': 'driver',
-   'data': {
-+      'alloc-track':'BlockdevOptionsAllocTrack',
-       'blkdebug':   'BlockdevOptionsBlkdebug',
-       'blklogwrites':'BlockdevOptionsBlklogwrites',
-       'blkverify':  'BlockdevOptionsBlkverify',
--- 
-2.39.5
-

debian/patches/pve/0059-block-qapi-include-child-references-in-block-device-.patch

@@ -1,137 +0,0 @@
-From 76442f3eafa8cbe647fe2d39e78e817ec681143c Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 2 Jul 2025 18:27:37 +0200
-Subject: [PATCH 59/59] block/qapi: include child references in block device
- info
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In combination with using a throttle filter to enforce IO limits for
-a guest device, knowing the 'file' child of a block device can be
-useful. If the throttle filter is only intended for guest IO, block
-jobs should not also be limited by the throttle filter, so the
-block operations need to be done with the 'file' child of the top
-throttle node as the target. In combination with mirroring, the name
-of that child is not fixed.
-
-Another scenario is when unplugging a guest device after mirroring
-below a top throttle node, where the mirror target is added explicitly
-via blockdev-add. After mirroring, the target becomes the new 'file'
-child of the throttle node. For unplugging, both the top throttle node
-and the mirror target need to be deleted, because only implicitly
-added child nodes are deleted automatically, and the current 'file'
-child of the throttle node was explicitly added (as the mirror
-target).
-
-In other scenarios, it could be useful to follow the backing chain.
-
-Note that iotests 191 and 273 use _filter_img_info, so the 'children'
-information is filtered out there.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- block/qapi.c               | 10 ++++++++++
- qapi/block-core.json       | 16 ++++++++++++++++
- tests/qemu-iotests/184.out |  8 ++++++++
- 3 files changed, 34 insertions(+)
-
-diff --git a/block/qapi.c b/block/qapi.c
-index 2c50a6bf3b..e08a1e970f 100644
---- a/block/qapi.c
-+++ b/block/qapi.c
-@@ -51,6 +51,8 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
-     ImageInfo *backing_info;
-     BlockDriverState *backing;
-     BlockDeviceInfo *info;
-+    BlockdevChildList **children_list_tail;
-+    BdrvChild *child;
- 
-     if (!bs->drv) {
-         error_setg(errp, "Block device %s is ejected", bs->node_name);
-@@ -77,6 +79,14 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
-         info->node_name = g_strdup(bs->node_name);
-     }
- 
-+    children_list_tail = &info->children;
-+    QLIST_FOREACH(child, &bs->children, next) {
-+        BlockdevChild *child_ref = g_new0(BlockdevChild, 1);
-+        child_ref->child = g_strdup(child->name);
-+        child_ref->node_name = g_strdup(child->bs->node_name);
-+        QAPI_LIST_APPEND(children_list_tail, child_ref);
-+    }
-+
-     backing = bdrv_cow_bs(bs);
-     if (backing) {
-         info->backing_file = g_strdup(backing->filename);
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 07c5773717..4db27f5819 100644
---- a/qapi/block-core.json
-+++ b/qapi/block-core.json
-@@ -461,6 +461,19 @@
-             'direct': 'bool',
-             'no-flush': 'bool' } }
- 
-+##
-+# @BlockdevChild:
-+#
-+# @child: The name of the child, for example 'file' or 'backing'.
-+#
-+# @node-name: The name of the child's block driver node.
-+#
-+# Since: 10.1
-+##
-+{ 'struct': 'BlockdevChild',
-+  'data': { 'child': 'str',
-+            'node-name': 'str' } }
-+
- ##
- # @BlockDeviceInfo:
- #
-@@ -486,6 +499,8 @@
- # @backing_file_depth: number of files in the backing file chain
- #     (since: 1.2)
- #
-+# @children: Information about child block nodes. (since: 10.1)
-+#
- # @active: true if the backend is active; typical cases for inactive backends
- #     are on the migration source instance after migration completes and on the
- #     destination before it completes. (since: 10.0)
-@@ -560,6 +575,7 @@
- { 'struct': 'BlockDeviceInfo',
-   'data': { 'file': 'str', '*node-name': 'str', 'ro': 'bool', 'drv': 'str',
-             '*backing_file': 'str', 'backing_file_depth': 'int',
-+            'children': ['BlockdevChild'],
-             'active': 'bool', 'encrypted': 'bool',
-             'detect_zeroes': 'BlockdevDetectZeroesOptions',
-             'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int',
-diff --git a/tests/qemu-iotests/184.out b/tests/qemu-iotests/184.out
-index 52692b6b3b..ef99bb2e9a 100644
---- a/tests/qemu-iotests/184.out
-+++ b/tests/qemu-iotests/184.out
-@@ -41,6 +41,12 @@ Testing:
-             },
-             "iops_wr": 0,
-             "ro": false,
-+            "children": [
-+                {
-+                    "node-name": "disk0",
-+                    "child": "file"
-+                }
-+            ],
-             "node-name": "throttle0",
-             "backing_file_depth": 1,
-             "drv": "throttle",
-@@ -69,6 +75,8 @@ Testing:
-             },
-             "iops_wr": 0,
-             "ro": false,
-+            "children": [
-+            ],
-             "node-name": "disk0",
-             "backing_file_depth": 0,
-             "drv": "null-co",
--- 
-2.39.5
-

debian/patches/pve/0060-savevm-async-reuse-migration-blocker-check-for-snaps.patch

@@ -1,150 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 18 Jun 2025 12:25:31 +0200
-Subject: [PATCH] savevm-async: reuse migration blocker check for
- snapshots/hibernation
-
-Same rationale as with upstream QEMU commit 5aaac46793 ("migration:
-savevm: consult migration blockers"), migration and (async) snapshot
-are essentially the same operation and thus snapshot also needs to
-check for migration blockers. For example, this catches passed-through
-PCI devices, where the driver does not support migration and VirtIO-GL
-display, which also does not support migration yet.
-
-In the case of VirtIO-GL, there were crashes [0].
-
-However, the commit notes:
-
-> There is really no difference between live migration and savevm, except
-> that savevm does not require bdrv_invalidate_cache to be implemented
-> by all disks.  However, it is unlikely that savevm is used with anything
-> except qcow2 disks, so the penalty is small and worth the improvement
-> in catching bad usage of savevm.
-
-and for Proxmox VE, suspend-to-disk with VMDK does use savevm-async
-and would be broken by simply using migration_is_blocked(). To keep
-this working, introduce a new helper that filters blockers with the
-prefix used by the VMDK migration blocker.
-
-The function qemu_savevm_state_blocked() is called as part of
-savevm_async_is_blocked() so no check is lost with this
-patch. The helper is declared in migration/migration.c to be able to
-access the 'migration_blockers'.
-
-The VMDK blocker message is declared via a '#define', because using a
-'const char*' led to the linker to complain about multiple
-declarations. The message does not include the reference to the block
-node anymore, but users can still easily find a VMDK disk in the VM
-configuration.
-
-Note, this also "breaks" snapshot and hibernate with VNC clipboard by
-preventing it. Previously, this would "work", because the Proxmox VE
-API has no check yet, but the clipboard will be broken after rollback,
-in the sense that it cannot be used anymore, not just lost contents.
-So some users might consider adding the check here a breaking change
-even if it's technically correct to prevent snapshot and hibernate
-with VNC clipboard. But other users might rightfully complain about
-broken clipboard. And again, the check also prevents blockers from
-passed-through PCI devices, etc. so it seems worth tolerating that
-breakage.
-
-[0]: https://forum.proxmox.com/threads/136976/
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Message-ID: <20250618102531.57444-1-f.ebner@proxmox.com>
----
- block/vmdk.c                |  4 +---
- include/migration/blocker.h |  2 ++
- migration/migration.c       | 24 ++++++++++++++++++++++++
- migration/migration.h       |  1 +
- migration/savevm-async.c    |  2 +-
- 5 files changed, 29 insertions(+), 4 deletions(-)
-
-diff --git a/block/vmdk.c b/block/vmdk.c
-index 2adec49912..80696a8d27 100644
---- a/block/vmdk.c
-+++ b/block/vmdk.c
-@@ -1402,9 +1402,7 @@ static int vmdk_open(BlockDriverState *bs, QDict *options, int flags,
-     qemu_co_mutex_init(&s->lock);
- 
-     /* Disable migration when VMDK images are used */
--    error_setg(&s->migration_blocker, "The vmdk format used by node '%s' "
--               "does not support live migration",
--               bdrv_get_device_or_node_name(bs));
-+    error_setg(&s->migration_blocker, "%s", MIGRATION_BLOCKER_VMDK);
-     ret = migrate_add_blocker_normal(&s->migration_blocker, errp);
-     if (ret < 0) {
-         goto fail;
-diff --git a/include/migration/blocker.h b/include/migration/blocker.h
-index a687ac0efe..f36bfb2df1 100644
---- a/include/migration/blocker.h
-+++ b/include/migration/blocker.h
-@@ -18,6 +18,8 @@
- 
- #define MIG_MODE_ALL MIG_MODE__MAX
- 
-+#define MIGRATION_BLOCKER_VMDK "The vmdk format used by a disk does not support live migration"
-+
- /**
-  * @migrate_add_blocker - prevent all modes of migration from proceeding
-  *
-diff --git a/migration/migration.c b/migration/migration.c
-index 2f3430f440..ecad1aca32 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -2030,6 +2030,30 @@ bool migration_is_blocked(Error **errp)
-     return false;
- }
- 
-+bool savevm_async_is_blocked(Error **errp)
-+{
-+    GSList *blockers = migration_blockers[migrate_mode()];
-+
-+    if (qemu_savevm_state_blocked(errp)) {
-+        return true;
-+    }
-+
-+    /*
-+     * The limitation for VMDK images only applies to live-migration, not
-+     * snapshots, see commit 5aaac46793 ("migration: savevm: consult migration
-+     * blockers").
-+     */
-+    while (blockers) {
-+        if (strcmp(error_get_pretty(blockers->data), MIGRATION_BLOCKER_VMDK)) {
-+            error_propagate(errp, error_copy(blockers->data));
-+            return true;
-+        }
-+        blockers = g_slist_next(blockers);
-+    }
-+
-+    return false;
-+}
-+
- /* Returns true if continue to migrate, or false if error detected */
- static bool migrate_prepare(MigrationState *s, bool resume, Error **errp)
- {
-diff --git a/migration/migration.h b/migration/migration.h
-index d53f7cad84..b772073572 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -531,6 +531,7 @@ int migration_call_notifiers(MigrationState *s, MigrationEventType type,
- 
- int migrate_init(MigrationState *s, Error **errp);
- bool migration_is_blocked(Error **errp);
-+bool savevm_async_is_blocked(Error **errp);
- /* True if outgoing migration has entered postcopy phase */
- bool migration_in_postcopy(void);
- bool migration_postcopy_is_alive(MigrationStatus state);
-diff --git a/migration/savevm-async.c b/migration/savevm-async.c
-index 730b815494..6cb91dca27 100644
---- a/migration/savevm-async.c
-+++ b/migration/savevm-async.c
-@@ -375,7 +375,7 @@ void qmp_savevm_start(const char *statefile, Error **errp)
-         return;
-     }
- 
--    if (qemu_savevm_state_blocked(errp)) {
-+    if (savevm_async_is_blocked(errp)) {
-         goto fail;
-     }
- 

debian/patches/series

@@ -1,5 +1,15 @@
 extra/0001-monitor-qmp-fix-race-with-clients-disconnecting-earl.patch
-extra/0002-ide-avoid-potential-deadlock-when-draining-during-tr.patch
+extra/0002-scsi-megasas-Internal-cdbs-have-16-byte-length.patch
+extra/0003-ide-avoid-potential-deadlock-when-draining-during-tr.patch
+extra/0004-Revert-x86-acpi-workaround-Windows-not-handling-name.patch
+extra/0005-block-copy-before-write-use-uint64_t-for-timeout-in-.patch
+extra/0006-virtio-gpu-fix-v2-migration.patch
+extra/0007-hw-pflash-fix-block-write-start.patch
+extra/0008-target-i386-fix-operand-size-for-DATA16-REX.W-POPCNT.patch
+extra/0009-target-i386-rdpkru-wrpkru-are-no-prefix-instructions.patch
+extra/0010-target-i386-fix-feature-dependency-for-WAITPKG.patch
+extra/0011-Revert-virtio-pci-fix-use-of-a-released-vector.patch
+extra/0012-hw-core-machine-move-compatibility-flags-for-VirtIO-.patch
 bitmap-mirror/0001-drive-mirror-add-support-for-sync-bitmap-mode-never.patch
 bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch
 bitmap-mirror/0003-mirror-add-check-for-bitmap-mode-without-bitmap.patch
@@ -47,23 +57,14 @@ pve/0038-block-add-alloc-track-driver.patch
 pve/0039-Revert-block-rbd-workaround-for-ceph-issue-53784.patch
 pve/0040-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch
 pve/0041-Revert-block-rbd-implement-bdrv_co_block_status.patch
-pve/0042-PVE-backup-add-fleecing-option.patch
-pve/0043-adapt-machine-version-deprecation-for-Proxmox-VE.patch
-pve/0044-Revert-hpet-avoid-timer-storms-on-periodic-timers.patch
-pve/0045-Revert-hpet-store-full-64-bit-target-value-of-the-co.patch
-pve/0046-Revert-hpet-accept-64-bit-reads-and-writes.patch
-pve/0047-Revert-hpet-place-read-only-bits-directly-in-new_val.patch
-pve/0048-Revert-hpet-remove-unnecessary-variable-index.patch
-pve/0049-Revert-hpet-ignore-high-bits-of-comparator-in-32-bit.patch
-pve/0050-Revert-hpet-fix-and-cleanup-persistence-of-interrupt.patch
-pve/0051-PVE-backup-factor-out-helper-to-clear-backup-state-s.patch
-pve/0052-PVE-backup-factor-out-helper-to-initialize-backup-st.patch
-pve/0053-PVE-backup-add-target-ID-in-backup-state.patch
-pve/0054-PVE-backup-get-device-info-allow-caller-to-specify-f.patch
-pve/0055-PVE-backup-implement-backup-access-setup-and-teardow.patch
-pve/0056-PVE-backup-prepare-for-the-switch-to-using-blockdev-.patch
-pve/0057-block-zeroinit-support-using-as-blockdev-driver.patch
-pve/0058-block-alloc-track-support-using-as-blockdev-driver.patch
-pve/0059-block-qapi-include-child-references-in-block-device-.patch
-pve/0060-savevm-async-reuse-migration-blocker-check-for-snaps.patch
-pve-qemu-10.0-vitastor.patch
+pve/0042-alloc-track-error-out-when-auto-remove-is-not-set.patch
+pve/0043-alloc-track-avoid-seemingly-superfluous-child-permis.patch
+pve/0044-block-copy-before-write-fix-permission.patch
+pve/0045-block-copy-before-write-support-unligned-snapshot-di.patch
+pve/0046-block-copy-before-write-create-block_copy-bitmap-in-.patch
+pve/0047-qapi-blockdev-backup-add-discard-source-parameter.patch
+pve/0048-copy-before-write-allow-specifying-minimum-cluster-s.patch
+pve/0049-backup-add-minimum-cluster-size-to-performance-optio.patch
+pve/0050-PVE-backup-add-fleecing-option.patch
+pve/0051-PVE-backup-improve-error-when-copy-before-write-fail.patch
+pve-qemu-9.0-vitastor.patch

debian/rules

@@ -61,6 +61,7 @@ endif
 	    --disable-xen \
 	    --enable-curl \
 	    --enable-docs \
+	    --enable-glusterfs \
 	    --enable-gnutls \
 	    --enable-libiscsi \
 	    --enable-libusb \
@@ -130,7 +131,8 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
+	# exclude historic Changelog file, which stops at release 0.14
+	dh_installchangelogs --exclude=Changelog
 	dh_installdocs
 	dh_installexamples
 	dh_install