[pve-devel] [PATCH qemu 3/5] alloc-track/zeroinit: squash patches enabling using with blockdev into patches adding block drivers

[Fiona Ebner <f.ebner@proxmox.com>]

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 ...add-the-zeroinit-block-driver-filter.patch | 46 +++++++++---
 ...le-posix-make-locking-optiono-on-cre.patch |  6 +-
 ...ckup-Proxmox-backup-patches-for-QEMU.patch |  2 +-
 ...k-driver-to-map-backup-archives-into.patch |  2 +-
 ...igrate-dirty-bitmap-state-via-savevm.patch |  2 +-
 .../0038-block-add-alloc-track-driver.patch   | 53 ++++++++++++--
 .../0042-PVE-backup-add-fleecing-option.patch |  2 +-
 ...e-version-deprecation-for-Proxmox-VE.patch |  2 +-
 ...ment-backup-access-setup-and-teardow.patch |  2 +-
 ...re-for-the-switch-to-using-blockdev-.patch |  9 +--
 ...e-child-references-in-block-device-.patch} |  8 +--
 ...nit-support-using-as-blockdev-driver.patch | 71 -------------------
 ...ack-support-using-as-blockdev-driver.patch | 61 ----------------
 ...e-migration-blocker-check-for-snaps.patch} |  0
 debian/patches/series                         |  6 +-
 15 files changed, 103 insertions(+), 169 deletions(-)
 rename debian/patches/pve/{0059-block-qapi-include-child-references-in-block-device-.patch => 0057-block-qapi-include-child-references-in-block-device-.patch} (96%)
 delete mode 100644 debian/patches/pve/0057-block-zeroinit-support-using-as-blockdev-driver.patch
 delete mode 100644 debian/patches/pve/0058-block-alloc-track-support-using-as-blockdev-driver.patch
 rename debian/patches/pve/{0060-savevm-async-reuse-migration-blocker-check-for-snaps.patch => 0058-savevm-async-reuse-migration-blocker-check-for-snaps.patch} (100%)

diff --git a/debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch b/debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch
index dc1145d..0534dc1 100644
--- a/debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch
+++ b/debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch
@@ -9,9 +9,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
      use dedicated function to open file child]
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
- block/meson.build |   1 +
- block/zeroinit.c  | 207 ++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 208 insertions(+)
+ block/meson.build    |   1 +
+ block/zeroinit.c     | 213 +++++++++++++++++++++++++++++++++++++++++++
+ qapi/block-core.json |   5 +-
+ 3 files changed, 217 insertions(+), 2 deletions(-)
  create mode 100644 block/zeroinit.c
 
 diff --git a/block/meson.build b/block/meson.build
@@ -28,10 +29,10 @@ index 34b1b2a306..a21d9a5411 100644
  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..036edb17f5
 --- /dev/null
 +++ b/block/zeroinit.c
-@@ -0,0 +1,207 @@
+@@ -0,0 +1,213 @@
 +/*
 + * Filter to fake a zero-initialized block device.
 + *
@@ -100,6 +101,7 @@ index 0000000000..f9d513db15
 +    QemuOpts *opts;
 +    Error *local_err = NULL;
 +    int ret;
++    const char *next = NULL;
 +
 +    s->extents = 0;
 +
@@ -111,9 +113,14 @@ index 0000000000..f9d513db15
 +        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;
@@ -239,3 +246,26 @@ index 0000000000..f9d513db15
 +}
 +
 +block_init(bdrv_zeroinit_init);
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index 0e5f148d30..0711253f06 100644
+--- a/qapi/block-core.json
++++ b/qapi/block-core.json
+@@ -3241,7 +3241,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:
+@@ -4799,7 +4799,8 @@
+                       'if': 'CONFIG_BLKIO' },
+       'vmdk':       'BlockdevOptionsGenericCOWFormat',
+       'vpc':        'BlockdevOptionsGenericFormat',
+-      'vvfat':      'BlockdevOptionsVVFAT'
++      'vvfat':      'BlockdevOptionsVVFAT',
++      'zeroinit':   'BlockdevOptionsGenericFormat'
+   } }
+ 
+ ##
diff --git a/debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch b/debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch
index bf230a5..e01dfc4 100644
--- a/debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch
+++ b/debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch
@@ -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 0711253f06..7f92c80179 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -5016,6 +5016,10 @@
+@@ -5017,6 +5017,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 @@
+@@ -5024,7 +5028,8 @@
              'size':                 'size',
              '*preallocation':       'PreallocMode',
              '*nocow':               'bool',
diff --git a/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch b/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch
index 3a4ca0f..abea096 100644
--- a/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch
+++ b/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch
@@ -1687,7 +1687,7 @@ index 0000000000..e931cb9203
 +    return ret;
 +}
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 1c05413916..dd98e03bf1 100644
+index 7f92c80179..5379fde30f 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -855,6 +855,239 @@
diff --git a/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch b/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch
index 80363f0..0c0f3f6 100644
--- a/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch
+++ b/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch
@@ -361,7 +361,7 @@ index 8508aab9c9..9c39f54f86 100644
  summary_info += {'libdaxctl support': libdaxctl}
  summary_info += {'libcbor support':   libcbor}
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index dd98e03bf1..0c3ebfa74e 100644
+index 5379fde30f..01fb2d899d 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -3470,6 +3470,7 @@
diff --git a/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch b/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
index cf3897f..bf06ca7 100644
--- a/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
+++ b/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
@@ -192,7 +192,7 @@ 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 01fb2d899d..7b32b59717 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -1008,6 +1008,11 @@
diff --git a/debian/patches/pve/0038-block-add-alloc-track-driver.patch b/debian/patches/pve/0038-block-add-alloc-track-driver.patch
index 5def145..b582205 100644
--- a/debian/patches/pve/0038-block-add-alloc-track-driver.patch
+++ b/debian/patches/pve/0038-block-add-alloc-track-driver.patch
@@ -35,10 +35,11 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
      avoid superfluous child permission update]
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
- block/alloc-track.c | 343 ++++++++++++++++++++++++++++++++++++++++++++
- block/meson.build   |   1 +
- block/stream.c      |  34 +++++
- 3 files changed, 378 insertions(+)
+ block/alloc-track.c  | 343 +++++++++++++++++++++++++++++++++++++++++++
+ block/meson.build    |   1 +
+ block/stream.c       |  34 +++++
+ qapi/block-core.json |  19 ++-
+ 4 files changed, 396 insertions(+), 1 deletion(-)
  create mode 100644 block/alloc-track.c
 
 diff --git a/block/alloc-track.c b/block/alloc-track.c
@@ -447,3 +448,47 @@ index e187cd1262..0b61029399 100644
      }
  
  out:
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index 7b32b59717..8d912dc96b 100644
+--- a/qapi/block-core.json
++++ b/qapi/block-core.json
+@@ -3462,7 +3462,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' ] },
+@@ -3563,6 +3564,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:
+ #
+@@ -5009,6 +5025,7 @@
+             '*detect-zeroes': 'BlockdevDetectZeroesOptions' },
+   'discriminator': 'driver',
+   'data': {
++      'alloc-track':'BlockdevOptionsAllocTrack',
+       'blkdebug':   'BlockdevOptionsBlkdebug',
+       'blklogwrites':'BlockdevOptionsBlklogwrites',
+       'blkverify':  'BlockdevOptionsBlkverify',
diff --git a/debian/patches/pve/0042-PVE-backup-add-fleecing-option.patch b/debian/patches/pve/0042-PVE-backup-add-fleecing-option.patch
index 1fadfa5..12c60c7 100644
--- a/debian/patches/pve/0042-PVE-backup-add-fleecing-option.patch
+++ b/debian/patches/pve/0042-PVE-backup-add-fleecing-option.patch
@@ -429,7 +429,7 @@ index 366b015589..9b66788ab5 100644
      return ret;
  }
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 6838187607..9bdcfa31ea 100644
+index 8d912dc96b..ba2a13e668 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -952,6 +952,10 @@
diff --git a/debian/patches/pve/0043-adapt-machine-version-deprecation-for-Proxmox-VE.patch b/debian/patches/pve/0043-adapt-machine-version-deprecation-for-Proxmox-VE.patch
index 9d0d5d1..272133f 100644
--- a/debian/patches/pve/0043-adapt-machine-version-deprecation-for-Proxmox-VE.patch
+++ b/debian/patches/pve/0043-adapt-machine-version-deprecation-for-Proxmox-VE.patch
@@ -22,7 +22,7 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
  1 file changed, 51 insertions(+), 27 deletions(-)
 
 diff --git a/include/hw/boards.h b/include/hw/boards.h
-index 8ada4d5832..f9f3b75284 100644
+index 8ada4d5832..6bfc2a7961 100644
 --- a/include/hw/boards.h
 +++ b/include/hw/boards.h
 @@ -636,42 +636,66 @@ struct MachineState {
diff --git a/debian/patches/pve/0055-PVE-backup-implement-backup-access-setup-and-teardow.patch b/debian/patches/pve/0055-PVE-backup-implement-backup-access-setup-and-teardow.patch
index c4273a1..901442c 100644
--- a/debian/patches/pve/0055-PVE-backup-implement-backup-access-setup-and-teardow.patch
+++ b/debian/patches/pve/0055-PVE-backup-implement-backup-access-setup-and-teardow.patch
@@ -740,7 +740,7 @@ index 0000000000..9ebeef7c8f
 +
 +#endif /* PVE_BACKUP_H */
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 9bdcfa31ea..2fb51215f2 100644
+index ba2a13e668..07c5773717 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -1023,6 +1023,9 @@
diff --git a/debian/patches/pve/0056-PVE-backup-prepare-for-the-switch-to-using-blockdev-.patch b/debian/patches/pve/0056-PVE-backup-prepare-for-the-switch-to-using-blockdev-.patch
index eaa23d4..6d4bfe1 100644
--- a/debian/patches/pve/0056-PVE-backup-prepare-for-the-switch-to-using-blockdev-.patch
+++ b/debian/patches/pve/0056-PVE-backup-prepare-for-the-switch-to-using-blockdev-.patch
@@ -1,8 +1,8 @@
-From 5a8cf9e98ba1668a6a20c2fcda1704de4103ff58 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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
+Subject: [PATCH] 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
@@ -101,6 +101,3 @@ index 0450303017..457fcb7e5c 100644
              di_list = g_list_append(di_list, di);
          }
      }
--- 
-2.39.5
-
diff --git a/debian/patches/pve/0059-block-qapi-include-child-references-in-block-device-.patch b/debian/patches/pve/0057-block-qapi-include-child-references-in-block-device-.patch
similarity index 96%
rename from debian/patches/pve/0059-block-qapi-include-child-references-in-block-device-.patch
rename to debian/patches/pve/0057-block-qapi-include-child-references-in-block-device-.patch
index 54a7804..dc33d5f 100644
--- a/debian/patches/pve/0059-block-qapi-include-child-references-in-block-device-.patch
+++ b/debian/patches/pve/0057-block-qapi-include-child-references-in-block-device-.patch
@@ -1,8 +1,7 @@
-From 76442f3eafa8cbe647fe2d39e78e817ec681143c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 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
+Subject: [PATCH] block/qapi: include child references in block device info
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -132,6 +131,3 @@ index 52692b6b3b..ef99bb2e9a 100644
              "node-name": "disk0",
              "backing_file_depth": 0,
              "drv": "null-co",
--- 
-2.39.5
-
diff --git a/debian/patches/pve/0057-block-zeroinit-support-using-as-blockdev-driver.patch b/debian/patches/pve/0057-block-zeroinit-support-using-as-blockdev-driver.patch
deleted file mode 100644
index 2390013..0000000
--- a/debian/patches/pve/0057-block-zeroinit-support-using-as-blockdev-driver.patch
+++ /dev/null
@@ -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
-
diff --git a/debian/patches/pve/0058-block-alloc-track-support-using-as-blockdev-driver.patch b/debian/patches/pve/0058-block-alloc-track-support-using-as-blockdev-driver.patch
deleted file mode 100644
index d7db80c..0000000
--- a/debian/patches/pve/0058-block-alloc-track-support-using-as-blockdev-driver.patch
+++ /dev/null
@@ -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
-
diff --git a/debian/patches/pve/0060-savevm-async-reuse-migration-blocker-check-for-snaps.patch b/debian/patches/pve/0058-savevm-async-reuse-migration-blocker-check-for-snaps.patch
similarity index 100%
rename from debian/patches/pve/0060-savevm-async-reuse-migration-blocker-check-for-snaps.patch
rename to debian/patches/pve/0058-savevm-async-reuse-migration-blocker-check-for-snaps.patch
diff --git a/debian/patches/series b/debian/patches/series
index 6e5fd69..d7cbd42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -62,7 +62,5 @@ 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/0057-block-qapi-include-child-references-in-block-device-.patch
+pve/0058-savevm-async-reuse-migration-blocker-check-for-snaps.patch
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel