patches: update context

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/debian/patches/pve/0021-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch b/debian/patches/pve/0021-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch
index 5f1838c645e587f3b9e3759b2e1fab8638335131..1d758aa13f1a9c1783ff58e09084796a7efa4c9a 100644 (file)
--- a/debian/patches/pve/0021-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch
+++ b/debian/patches/pve/0021-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch
@@ -119,10 +119,10 @@ index 821405fd02..e3b6c3c524 100644
      };
      return raw_co_create(&options, errp);
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index da5dca1e3b..cd69af921e 100644
+index 1d3dd9cb48..3f81d6a5c0 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -4466,7 +4466,8 @@
+@@ -4445,7 +4445,8 @@
              'size':                 'size',
              '*preallocation':       'PreallocMode',
              '*nocow':               'bool',

diff --git a/debian/patches/pve/0025-block-backup-move-bcs-bitmap-initialization-to-job-c.patch b/debian/patches/pve/0025-block-backup-move-bcs-bitmap-initialization-to-job-c.patch
index 6a540f89a2fd2c59dbfa2fd4004af746f4d761bc..5d2679c803660846d259d17d8cef26046d0496f7 100644 (file)
--- a/debian/patches/pve/0025-block-backup-move-bcs-bitmap-initialization-to-job-c.patch
+++ b/debian/patches/pve/0025-block-backup-move-bcs-bitmap-initialization-to-job-c.patch
@@ -19,6 +19,7 @@ upon job creation for the remaining case too, by moving the
 backup_init_bcs_bitmap call to backup_job_create.
 
 Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
  block/backup.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/pve/0027-PVE-Backup-add-backup-dump-block-driver.patch b/debian/patches/pve/0027-PVE-Backup-add-backup-dump-block-driver.patch
index f2d6f87ff757ba6df6fdc9e905e9f6c6114be66a..4b57124a5b4b43caff57f0cacd55e7b28d136e7d 100644 (file)
--- a/debian/patches/pve/0027-PVE-Backup-add-backup-dump-block-driver.patch
+++ b/debian/patches/pve/0027-PVE-Backup-add-backup-dump-block-driver.patch
@@ -253,7 +253,7 @@ index 72081a9974..7883df047c 100644
    'blkdebug.c',
    'blklogwrites.c',
 diff --git a/include/block/block_int.h b/include/block/block_int.h
-index ee0aeb1414..1574b5564b 100644
+index f4c75e8ba9..169dc43d59 100644
 --- a/include/block/block_int.h
 +++ b/include/block/block_int.h
 @@ -26,6 +26,7 @@

diff --git a/debian/patches/pve/0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch b/debian/patches/pve/0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch
index 8d302b9be6195b8adfbbd78ed4bad228ff420037..c08134511a5fa27122791ae4ce086e58051582a2 100644 (file)
--- a/debian/patches/pve/0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch
+++ b/debian/patches/pve/0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch
@@ -88,7 +88,7 @@ index 2ac4aedfff..f6668ab01d 100644
 +    hmp_handle_error(mon, error);
 +}
 diff --git a/blockdev.c b/blockdev.c
-index 4be0863050..29fee73cbd 100644
+index b35072644e..c0bc3db33e 100644
 --- a/blockdev.c
 +++ b/blockdev.c
 @@ -36,6 +36,7 @@
@@ -165,7 +165,7 @@ index 1ad13b668b..d4bb00216e 100644
  
      {
 diff --git a/include/block/block_int.h b/include/block/block_int.h
-index 1574b5564b..77076d7be3 100644
+index 169dc43d59..92f90c43eb 100644
 --- a/include/block/block_int.h
 +++ b/include/block/block_int.h
 @@ -67,7 +67,7 @@
@@ -1478,7 +1478,7 @@ index 0000000000..88f5ee133f
 +    return info;
 +}
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index cd69af921e..e4c3de0804 100644
+index 3f81d6a5c0..551ee28275 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -744,6 +744,115 @@

diff --git a/debian/patches/pve/0030-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch b/debian/patches/pve/0030-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch
index ff991d2ffa3636f9b0aaa1e3b110233a9bccf332..4c45d9150a83c23f0794e735448f927884d3d9a7 100644 (file)
--- a/debian/patches/pve/0030-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch
+++ b/debian/patches/pve/0030-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch
@@ -405,7 +405,7 @@ index 88f5ee133f..1c49cd178d 100644
      qemu_mutex_unlock(&backup_state.stat.lock);
  
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index e4c3de0804..379a8dd147 100644
+index 551ee28275..b9d6f52f0c 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -757,8 +757,13 @@

diff --git a/debian/patches/pve/0031-PVE-various-PBS-fixes.patch b/debian/patches/pve/0031-PVE-various-PBS-fixes.patch
index 39a3eb2d6ab467a9727320af6199ea44af95baad..8b07653b9d294ce8363c76b49cd9569b78fdb2f1 100644 (file)
--- a/debian/patches/pve/0031-PVE-various-PBS-fixes.patch
+++ b/debian/patches/pve/0031-PVE-various-PBS-fixes.patch
@@ -194,7 +194,7 @@ index 1c49cd178d..c15abefdda 100644
          .format = format,
          .has_config_file = has_config_file,
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 379a8dd147..88835ebcf6 100644
+index b9d6f52f0c..5d8e2eb303 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -822,6 +822,10 @@

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 10edf435a0ca0739728a44ff3b14a7a8a2f166a1..b3ea6b52e770f49bd7cf066f65e9a2e69ba61b81 100644 (file)
--- 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
@@ -368,10 +368,10 @@ index 1a4dfab4e2..85b3c63199 100644
  summary_info += {'libpmem support':   libpmem}
  summary_info += {'libdaxctl support': libdaxctl}
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 88835ebcf6..fd1ba7ccac 100644
+index 5d8e2eb303..777863e33b 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -3074,6 +3074,7 @@
+@@ -3053,6 +3053,7 @@
              'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels',
              'preallocate', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
              { 'name': 'replication', 'if': 'CONFIG_REPLICATION' },
@@ -379,7 +379,7 @@ index 88835ebcf6..fd1ba7ccac 100644
              'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
  
  ##
-@@ -3146,6 +3147,17 @@
+@@ -3125,6 +3126,17 @@
  { 'struct': 'BlockdevOptionsNull',
    'data': { '*size': 'int', '*latency-ns': 'uint64', '*read-zeroes': 'bool' } }
  
@@ -397,7 +397,7 @@ index 88835ebcf6..fd1ba7ccac 100644
  ##
  # @BlockdevOptionsNVMe:
  #
-@@ -4388,6 +4400,7 @@
+@@ -4367,6 +4379,7 @@
        'nfs':        'BlockdevOptionsNfs',
        'null-aio':   'BlockdevOptionsNull',
        'null-co':    'BlockdevOptionsNull',

diff --git a/debian/patches/pve/0033-PVE-add-query_proxmox_support-QMP-command.patch b/debian/patches/pve/0033-PVE-add-query_proxmox_support-QMP-command.patch
index 0b92aabd46efa4da12c67606d4c125ef62ebdd77..3df9eb6adff3cfe26bb97419e918e76e2c9b7440 100644 (file)
--- a/debian/patches/pve/0033-PVE-add-query_proxmox_support-QMP-command.patch
+++ b/debian/patches/pve/0033-PVE-add-query_proxmox_support-QMP-command.patch
@@ -33,7 +33,7 @@ index c15abefdda..4684789813 100644
 +    return ret;
 +}
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index fd1ba7ccac..fc498b779d 100644
+index 777863e33b..cfd980b70f 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -867,6 +867,35 @@

diff --git a/debian/patches/pve/0034-PVE-add-query-pbs-bitmap-info-QMP-call.patch b/debian/patches/pve/0034-PVE-add-query-pbs-bitmap-info-QMP-call.patch
index a8e345889219fa158818b1643a21d23254a83dd7..54b268f73b7f6ca03ff269cf5a6252b81774ee28 100644 (file)
--- a/debian/patches/pve/0034-PVE-add-query-pbs-bitmap-info-QMP-call.patch
+++ b/debian/patches/pve/0034-PVE-add-query-pbs-bitmap-info-QMP-call.patch
@@ -359,7 +359,7 @@ index 4684789813..f90abaa50a 100644
      return ret;
  }
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index fc498b779d..7b171fe27c 100644
+index cfd980b70f..8833060385 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -875,6 +875,8 @@

diff --git a/debian/patches/pve/0038-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch b/debian/patches/pve/0038-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch
index e6722baa82e0b9640ae91b1336e5653bc5938f7c..ce92c43f42e8a8d7383342c8b2ec25bbbd415c83 100644 (file)
--- a/debian/patches/pve/0038-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch
+++ b/debian/patches/pve/0038-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch
@@ -481,7 +481,7 @@ index 63c686463f..6f05796fad 100644
      qemu_mutex_unlock(&backup_state.stat.lock);
  
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 7b171fe27c..66a0e9fd6c 100644
+index 8833060385..6a67adf923 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -774,12 +774,15 @@

diff --git a/debian/patches/pve/0039-PVE-Migrate-dirty-bitmap-state-via-savevm.patch b/debian/patches/pve/0039-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
index 812343b067d5d8228138572534c73c61ad08db21..2463eb667d659cc5018f998419e4ab4442ac87bc 100644 (file)
--- a/debian/patches/pve/0039-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
+++ b/debian/patches/pve/0039-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
@@ -187,7 +187,7 @@ index 6f05796fad..5fa3cc1352 100644
      return ret;
  }
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 66a0e9fd6c..f6a5fb263a 100644
+index 6a67adf923..c99ddf8628 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -883,6 +883,11 @@

diff --git a/debian/patches/pve/0042-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch b/debian/patches/pve/0042-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch
index 2b97bfbc4ab07d07d71d44fd19b2ec6c6706900e..fc78bfb3dab01736b647eb3b0ff93df5ad3c098d 100644 (file)
--- a/debian/patches/pve/0042-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch
+++ b/debian/patches/pve/0042-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch
@@ -575,7 +575,7 @@ index 5fa3cc1352..323014744c 100644
  
  BackupStatus *qmp_query_backup(Error **errp)
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index f6a5fb263a..f216035d3c 100644
+index c99ddf8628..829dc7b8e9 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -846,7 +846,7 @@

diff --git a/debian/patches/pve/0043-PBS-add-master-key-support.patch b/debian/patches/pve/0043-PBS-add-master-key-support.patch
index f14d4d9238560f061bd3755216141e2686d548ca..eeaf6ba425e0684daf6fe588c7003d145101ffcc 100644 (file)
--- a/debian/patches/pve/0043-PBS-add-master-key-support.patch
+++ b/debian/patches/pve/0043-PBS-add-master-key-support.patch
@@ -58,7 +58,7 @@ index 323014744c..9f6c04a512 100644
      return ret;
  }
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index f216035d3c..c5023710f5 100644
+index 829dc7b8e9..d089328a1f 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
 @@ -817,6 +817,8 @@

diff --git a/debian/patches/pve/0050-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch b/debian/patches/pve/0050-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch
index f239cd466960ba3708c2dae1772b77b4ef359a47..62c171161df805998de3dfc5933bd5796484bda8 100644 (file)
--- a/debian/patches/pve/0050-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch
+++ b/debian/patches/pve/0050-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch
@@ -4,6 +4,7 @@ Date: Mon, 7 Feb 2022 14:21:01 +0100
 Subject: [PATCH] qemu-img: dd: add -l option for loading a snapshot
 
 Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
  docs/tools/qemu-img.rst |  6 +++---
  qemu-img-cmds.hx        |  4 ++--