From 271ac0a8a773f634ca613c811697c4c3ff5f09d1 Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Tue, 10 Jan 2023 09:40:57 +0100 Subject: [PATCH] add QAPI naming exceptions in patches introducing them Avoids a patch and is required to compile when not all patches are applied. No functional change is intended. Signed-off-by: Fiona Ebner --- .../0007-PVE-Up-qmp-add-get_link_status.patch | 18 +++++++--- ...virtio-balloon-improve-query-balloon.patch | 17 +++++++++- ...k-driver-to-map-backup-archives-into.patch | 15 ++++++++- ...register-yank-before-migration_inco.patch} | 0 ...valid-QAPI-names-for-backwards-compa.patch | 33 ------------------- ...add-l-option-for-loading-a-snapshot.patch} | 0 ...h => 0051-vma-allow-partial-restore.patch} | 0 ...patch => 0052-pbs-namespace-support.patch} | 0 ...rbd-workaround-for-ceph-issue-53784.patch} | 0 ...fix-handling-of-holes-in-.bdrv_co_b.patch} | 0 ...-rbd-implement-bdrv_co_block_status.patch} | 0 ...-jobs-correctly-cancel-in-error-sce.patch} | 0 ...sure-jobs-in-di_list-are-referenced.patch} | 0 ...-segfault-issues-upon-backup-cancel.patch} | 0 ...upport-64KiB-unaligned-input-images.patch} | 0 ...-triggering-assertion-in-error-case.patch} | 0 ...k-alloc-track-avoid-premature-break.patch} | 0 ...passing-max-workers-performance-set.patch} | 0 debian/patches/series | 29 ++++++++-------- 19 files changed, 58 insertions(+), 54 deletions(-) rename debian/patches/pve/{0050-PVE-savevm-async-register-yank-before-migration_inco.patch => 0049-PVE-savevm-async-register-yank-before-migration_inco.patch} (100%) delete mode 100644 debian/patches/pve/0049-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch rename debian/patches/pve/{0051-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch => 0050-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch} (100%) rename debian/patches/pve/{0052-vma-allow-partial-restore.patch => 0051-vma-allow-partial-restore.patch} (100%) rename debian/patches/pve/{0053-pbs-namespace-support.patch => 0052-pbs-namespace-support.patch} (100%) rename debian/patches/pve/{0054-Revert-block-rbd-workaround-for-ceph-issue-53784.patch => 0053-Revert-block-rbd-workaround-for-ceph-issue-53784.patch} (100%) rename debian/patches/pve/{0055-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch => 0054-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch} (100%) rename debian/patches/pve/{0056-Revert-block-rbd-implement-bdrv_co_block_status.patch => 0055-Revert-block-rbd-implement-bdrv_co_block_status.patch} (100%) rename debian/patches/pve/{0057-PVE-Backup-create-jobs-correctly-cancel-in-error-sce.patch => 0056-PVE-Backup-create-jobs-correctly-cancel-in-error-sce.patch} (100%) rename debian/patches/pve/{0058-PVE-Backup-ensure-jobs-in-di_list-are-referenced.patch => 0057-PVE-Backup-ensure-jobs-in-di_list-are-referenced.patch} (100%) rename debian/patches/pve/{0059-PVE-Backup-avoid-segfault-issues-upon-backup-cancel.patch => 0058-PVE-Backup-avoid-segfault-issues-upon-backup-cancel.patch} (100%) rename debian/patches/pve/{0060-vma-create-support-64KiB-unaligned-input-images.patch => 0059-vma-create-support-64KiB-unaligned-input-images.patch} (100%) rename debian/patches/pve/{0061-vma-create-avoid-triggering-assertion-in-error-case.patch => 0060-vma-create-avoid-triggering-assertion-in-error-case.patch} (100%) rename debian/patches/pve/{0062-block-alloc-track-avoid-premature-break.patch => 0061-block-alloc-track-avoid-premature-break.patch} (100%) rename debian/patches/pve/{0063-PVE-Backup-allow-passing-max-workers-performance-set.patch => 0062-PVE-Backup-allow-passing-max-workers-performance-set.patch} (100%) diff --git a/debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch b/debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch index 1e2ac12..22ffc63 100644 --- a/debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch +++ b/debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch @@ -4,11 +4,13 @@ Date: Mon, 6 Apr 2020 12:16:37 +0200 Subject: [PATCH] PVE: [Up] qmp: add get_link_status Signed-off-by: Thomas Lamprecht +[FE: add get_link_status to command name exceptions] +Signed-off-by: Fiona Ebner --- net/net.c | 27 +++++++++++++++++++++++++++ qapi/net.json | 15 +++++++++++++++ - qapi/pragma.json | 1 + - 3 files changed, 43 insertions(+) + qapi/pragma.json | 2 ++ + 3 files changed, 44 insertions(+) diff --git a/net/net.c b/net/net.c index 840ad9dca5..28e97c5d85 100644 @@ -75,10 +77,18 @@ index 522ac582ed..327d7c5a37 100644 # @netdev_add: # diff --git a/qapi/pragma.json b/qapi/pragma.json -index 7f810b0e97..a2358e303a 100644 +index 7f810b0e97..29233db825 100644 --- a/qapi/pragma.json +++ b/qapi/pragma.json -@@ -26,6 +26,7 @@ +@@ -15,6 +15,7 @@ + 'device_add', + 'device_del', + 'expire_password', ++ 'get_link_status', + 'migrate_cancel', + 'netdev_add', + 'netdev_del', +@@ -26,6 +27,7 @@ 'system_wakeup' ], # Commands allowed to return a non-dictionary 'command-returns-exceptions': [ diff --git a/debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch b/debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch index 35819c4..ad3eb76 100644 --- a/debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch +++ b/debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch @@ -7,11 +7,14 @@ Actually provide memory information via the query-balloon command. Signed-off-by: Thomas Lamprecht +[FE: add BalloonInfo to member name exceptions list] +Signed-off-by: Fiona Ebner --- hw/virtio/virtio-balloon.c | 33 +++++++++++++++++++++++++++++++-- monitor/hmp-cmds.c | 30 +++++++++++++++++++++++++++++- qapi/machine.json | 22 +++++++++++++++++++++- - 3 files changed, 81 insertions(+), 4 deletions(-) + qapi/pragma.json | 1 + + 4 files changed, 82 insertions(+), 4 deletions(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 73ac5eb675..bbfe7eca62 100644 @@ -133,3 +136,15 @@ index b9228a5e46..10e77a9af3 100644 ## # @query-balloon: +diff --git a/qapi/pragma.json b/qapi/pragma.json +index 29233db825..f2097b9020 100644 +--- a/qapi/pragma.json ++++ b/qapi/pragma.json +@@ -37,6 +37,7 @@ + 'member-name-exceptions': [ # visible in: + 'ACPISlotType', # query-acpi-ospm-status + 'AcpiTableOptions', # -acpitable ++ 'BalloonInfo', # query-balloon + 'BlkdebugEvent', # blockdev-add, -blockdev + 'BlkdebugSetStateOptions', # blockdev-add, -blockdev + 'BlockDeviceInfo', # query-block diff --git a/debian/patches/pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch b/debian/patches/pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch index 1f69589..ab28112 100644 --- a/debian/patches/pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch +++ b/debian/patches/pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch @@ -16,7 +16,8 @@ Signed-off-by: Fiona Ebner configure | 9 ++ meson.build | 2 +- qapi/block-core.json | 13 ++ - 5 files changed, 302 insertions(+), 1 deletion(-) + qapi/pragma.json | 1 + + 6 files changed, 303 insertions(+), 1 deletion(-) create mode 100644 block/pbs.c diff --git a/block/meson.build b/block/meson.build @@ -407,3 +408,15 @@ index 5ac6276dc1..45b63dfe26 100644 'nvme': 'BlockdevOptionsNVMe', 'nvme-io_uring': { 'type': 'BlockdevOptionsNvmeIoUring', 'if': 'CONFIG_BLKIO' }, +diff --git a/qapi/pragma.json b/qapi/pragma.json +index f2097b9020..5ab1890519 100644 +--- a/qapi/pragma.json ++++ b/qapi/pragma.json +@@ -47,6 +47,7 @@ + 'BlockInfo', # query-block + 'BlockdevAioOptions', # blockdev-add, -blockdev + 'BlockdevDriver', # blockdev-add, query-blockstats, ... ++ 'BlockdevOptionsPbs', # for PBS backwards compat + 'BlockdevVmdkAdapterType', # blockdev-create (to match VMDK spec) + 'BlockdevVmdkSubformat', # blockdev-create (to match VMDK spec) + 'ColoCompareProperties', # object_add, -object diff --git a/debian/patches/pve/0050-PVE-savevm-async-register-yank-before-migration_inco.patch b/debian/patches/pve/0049-PVE-savevm-async-register-yank-before-migration_inco.patch similarity index 100% rename from debian/patches/pve/0050-PVE-savevm-async-register-yank-before-migration_inco.patch rename to debian/patches/pve/0049-PVE-savevm-async-register-yank-before-migration_inco.patch diff --git a/debian/patches/pve/0049-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch b/debian/patches/pve/0049-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch deleted file mode 100644 index 95f191f..0000000 --- a/debian/patches/pve/0049-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Stefan Reiter -Date: Wed, 26 May 2021 15:26:30 +0200 -Subject: [PATCH] PVE: whitelist 'invalid' QAPI names for backwards compat - -Signed-off-by: Stefan Reiter -Signed-off-by: Thomas Lamprecht ---- - qapi/pragma.json | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/qapi/pragma.json b/qapi/pragma.json -index a2358e303a..9ff5c84ffd 100644 ---- a/qapi/pragma.json -+++ b/qapi/pragma.json -@@ -15,6 +15,7 @@ - 'device_add', - 'device_del', - 'expire_password', -+ 'get_link_status', - 'migrate_cancel', - 'netdev_add', - 'netdev_del', -@@ -64,6 +65,8 @@ - 'SysEmuTarget', # query-cpu-fast, query-target - 'UuidInfo', # query-uuid - 'VncClientInfo', # query-vnc, query-vnc-servers, ... -- 'X86CPURegister32' # qom-get of x86 CPU properties -+ 'X86CPURegister32', # qom-get of x86 CPU properties - # feature-words, filtered-features -+ 'BlockdevOptionsPbs', # for PBS backwards compat -+ 'BalloonInfo' - ] } } diff --git a/debian/patches/pve/0051-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 similarity index 100% rename from debian/patches/pve/0051-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch rename to debian/patches/pve/0050-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch diff --git a/debian/patches/pve/0052-vma-allow-partial-restore.patch b/debian/patches/pve/0051-vma-allow-partial-restore.patch similarity index 100% rename from debian/patches/pve/0052-vma-allow-partial-restore.patch rename to debian/patches/pve/0051-vma-allow-partial-restore.patch diff --git a/debian/patches/pve/0053-pbs-namespace-support.patch b/debian/patches/pve/0052-pbs-namespace-support.patch similarity index 100% rename from debian/patches/pve/0053-pbs-namespace-support.patch rename to debian/patches/pve/0052-pbs-namespace-support.patch diff --git a/debian/patches/pve/0054-Revert-block-rbd-workaround-for-ceph-issue-53784.patch b/debian/patches/pve/0053-Revert-block-rbd-workaround-for-ceph-issue-53784.patch similarity index 100% rename from debian/patches/pve/0054-Revert-block-rbd-workaround-for-ceph-issue-53784.patch rename to debian/patches/pve/0053-Revert-block-rbd-workaround-for-ceph-issue-53784.patch diff --git a/debian/patches/pve/0055-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch b/debian/patches/pve/0054-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch similarity index 100% rename from debian/patches/pve/0055-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch rename to debian/patches/pve/0054-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch diff --git a/debian/patches/pve/0056-Revert-block-rbd-implement-bdrv_co_block_status.patch b/debian/patches/pve/0055-Revert-block-rbd-implement-bdrv_co_block_status.patch similarity index 100% rename from debian/patches/pve/0056-Revert-block-rbd-implement-bdrv_co_block_status.patch rename to debian/patches/pve/0055-Revert-block-rbd-implement-bdrv_co_block_status.patch diff --git a/debian/patches/pve/0057-PVE-Backup-create-jobs-correctly-cancel-in-error-sce.patch b/debian/patches/pve/0056-PVE-Backup-create-jobs-correctly-cancel-in-error-sce.patch similarity index 100% rename from debian/patches/pve/0057-PVE-Backup-create-jobs-correctly-cancel-in-error-sce.patch rename to debian/patches/pve/0056-PVE-Backup-create-jobs-correctly-cancel-in-error-sce.patch diff --git a/debian/patches/pve/0058-PVE-Backup-ensure-jobs-in-di_list-are-referenced.patch b/debian/patches/pve/0057-PVE-Backup-ensure-jobs-in-di_list-are-referenced.patch similarity index 100% rename from debian/patches/pve/0058-PVE-Backup-ensure-jobs-in-di_list-are-referenced.patch rename to debian/patches/pve/0057-PVE-Backup-ensure-jobs-in-di_list-are-referenced.patch diff --git a/debian/patches/pve/0059-PVE-Backup-avoid-segfault-issues-upon-backup-cancel.patch b/debian/patches/pve/0058-PVE-Backup-avoid-segfault-issues-upon-backup-cancel.patch similarity index 100% rename from debian/patches/pve/0059-PVE-Backup-avoid-segfault-issues-upon-backup-cancel.patch rename to debian/patches/pve/0058-PVE-Backup-avoid-segfault-issues-upon-backup-cancel.patch diff --git a/debian/patches/pve/0060-vma-create-support-64KiB-unaligned-input-images.patch b/debian/patches/pve/0059-vma-create-support-64KiB-unaligned-input-images.patch similarity index 100% rename from debian/patches/pve/0060-vma-create-support-64KiB-unaligned-input-images.patch rename to debian/patches/pve/0059-vma-create-support-64KiB-unaligned-input-images.patch diff --git a/debian/patches/pve/0061-vma-create-avoid-triggering-assertion-in-error-case.patch b/debian/patches/pve/0060-vma-create-avoid-triggering-assertion-in-error-case.patch similarity index 100% rename from debian/patches/pve/0061-vma-create-avoid-triggering-assertion-in-error-case.patch rename to debian/patches/pve/0060-vma-create-avoid-triggering-assertion-in-error-case.patch diff --git a/debian/patches/pve/0062-block-alloc-track-avoid-premature-break.patch b/debian/patches/pve/0061-block-alloc-track-avoid-premature-break.patch similarity index 100% rename from debian/patches/pve/0062-block-alloc-track-avoid-premature-break.patch rename to debian/patches/pve/0061-block-alloc-track-avoid-premature-break.patch diff --git a/debian/patches/pve/0063-PVE-Backup-allow-passing-max-workers-performance-set.patch b/debian/patches/pve/0062-PVE-Backup-allow-passing-max-workers-performance-set.patch similarity index 100% rename from debian/patches/pve/0063-PVE-Backup-allow-passing-max-workers-performance-set.patch rename to debian/patches/pve/0062-PVE-Backup-allow-passing-max-workers-performance-set.patch diff --git a/debian/patches/series b/debian/patches/series index 191ba29..1b7795a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -54,18 +54,17 @@ pve/0045-PVE-block-pbs-fast-path-reads-without-allocation-if-.patch pve/0046-PVE-block-stream-increase-chunk-size.patch pve/0047-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch pve/0048-block-add-alloc-track-driver.patch -pve/0049-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch -pve/0050-PVE-savevm-async-register-yank-before-migration_inco.patch -pve/0051-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch -pve/0052-vma-allow-partial-restore.patch -pve/0053-pbs-namespace-support.patch -pve/0054-Revert-block-rbd-workaround-for-ceph-issue-53784.patch -pve/0055-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch -pve/0056-Revert-block-rbd-implement-bdrv_co_block_status.patch -pve/0057-PVE-Backup-create-jobs-correctly-cancel-in-error-sce.patch -pve/0058-PVE-Backup-ensure-jobs-in-di_list-are-referenced.patch -pve/0059-PVE-Backup-avoid-segfault-issues-upon-backup-cancel.patch -pve/0060-vma-create-support-64KiB-unaligned-input-images.patch -pve/0061-vma-create-avoid-triggering-assertion-in-error-case.patch -pve/0062-block-alloc-track-avoid-premature-break.patch -pve/0063-PVE-Backup-allow-passing-max-workers-performance-set.patch +pve/0049-PVE-savevm-async-register-yank-before-migration_inco.patch +pve/0050-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch +pve/0051-vma-allow-partial-restore.patch +pve/0052-pbs-namespace-support.patch +pve/0053-Revert-block-rbd-workaround-for-ceph-issue-53784.patch +pve/0054-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch +pve/0055-Revert-block-rbd-implement-bdrv_co_block_status.patch +pve/0056-PVE-Backup-create-jobs-correctly-cancel-in-error-sce.patch +pve/0057-PVE-Backup-ensure-jobs-in-di_list-are-referenced.patch +pve/0058-PVE-Backup-avoid-segfault-issues-upon-backup-cancel.patch +pve/0059-vma-create-support-64KiB-unaligned-input-images.patch +pve/0060-vma-create-avoid-triggering-assertion-in-error-case.patch +pve/0061-block-alloc-track-avoid-premature-break.patch +pve/0062-PVE-Backup-allow-passing-max-workers-performance-set.patch