From a816d2969eb0fd9580bfdff44f16bde7ab258a78 Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Wed, 24 May 2023 15:56:52 +0200 Subject: [PATCH] drop patch for custom get_link_status QMP command There doesn't seem to be any Proxmox VE code using this. Signed-off-by: Fiona Ebner --- ...VE-Up-glusterfs-allow-partial-reads.patch} | 0 .../0007-PVE-Up-qmp-add-get_link_status.patch | 98 ------------------- ...eturn-success-on-info-without-snaps.patch} | 0 ...d-add-osize-and-read-from-to-stdin-.patch} | 0 ...-Up-qemu-img-dd-add-isize-parameter.patch} | 0 ...VE-Up-qemu-img-dd-add-n-skip_create.patch} | 0 ...add-l-option-for-loading-a-snapshot.patch} | 0 ...irtio-balloon-improve-query-balloon.patch} | 4 +- ...0014-PVE-qapi-modify-query-machines.patch} | 0 ...=> 0015-PVE-qapi-modify-spice-query.patch} | 0 ...nel-implementation-for-savevm-async.patch} | 0 ...sync-for-background-state-snapshots.patch} | 0 ...dd-optional-buffer-size-to-QEMUFile.patch} | 0 ...dd-the-zeroinit-block-driver-filter.patch} | 0 ...Add-dummy-id-command-line-parameter.patch} | 0 ...-target-i386-disable-LINT0-after-re.patch} | 0 ...e-posix-make-locking-optiono-on-cre.patch} | 0 ...-PVE-monitor-disable-oob-capability.patch} | 0 ...ed-balloon-qemu-4-0-config-size-fal.patch} | 0 ...-Allow-version-code-in-machine-type.patch} | 0 ...-bcs-bitmap-initialization-to-job-c.patch} | 0 ...E-Backup-add-vma-backup-format-code.patch} | 0 ...Backup-add-backup-dump-block-driver.patch} | 0 ...-sequential-job-transaction-support.patch} | 0 ...kup-Proxmox-backup-patches-for-QEMU.patch} | 0 ...store-new-command-to-restore-from-p.patch} | 0 ...-driver-to-map-backup-archives-into.patch} | 4 +- ...t-stderr-to-journal-when-daemonized.patch} | 0 ...grate-dirty-bitmap-state-via-savevm.patch} | 0 ...irty-bitmap-migrate-other-bitmaps-e.patch} | 0 ...ll-back-to-open-iscsi-initiatorname.patch} | 0 ...VE-block-stream-increase-chunk-size.patch} | 0 ...ccept-NULL-qiov-in-bdrv_pad_request.patch} | 0 ...> 0039-block-add-alloc-track-driver.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 ...lloc-track-fix-deadlock-during-drop.patch} | 0 ...pshots-hold-the-BQL-during-setup-ca.patch} | 0 ...m-async-don-t-hold-BQL-during-setup.patch} | 0 debian/patches/series | 79 ++++++++------- 41 files changed, 43 insertions(+), 142 deletions(-) rename debian/patches/pve/{0008-PVE-Up-glusterfs-allow-partial-reads.patch => 0007-PVE-Up-glusterfs-allow-partial-reads.patch} (100%) delete mode 100644 debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch rename debian/patches/pve/{0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch => 0008-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch} (100%) rename debian/patches/pve/{0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch => 0009-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch} (100%) rename debian/patches/pve/{0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch => 0010-PVE-Up-qemu-img-dd-add-isize-parameter.patch} (100%) rename debian/patches/pve/{0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch => 0011-PVE-Up-qemu-img-dd-add-n-skip_create.patch} (100%) rename debian/patches/pve/{0013-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch => 0012-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch} (100%) rename debian/patches/pve/{0014-PVE-virtio-balloon-improve-query-balloon.patch => 0013-PVE-virtio-balloon-improve-query-balloon.patch} (99%) rename debian/patches/pve/{0015-PVE-qapi-modify-query-machines.patch => 0014-PVE-qapi-modify-query-machines.patch} (100%) rename debian/patches/pve/{0016-PVE-qapi-modify-spice-query.patch => 0015-PVE-qapi-modify-spice-query.patch} (100%) rename debian/patches/pve/{0017-PVE-add-IOChannel-implementation-for-savevm-async.patch => 0016-PVE-add-IOChannel-implementation-for-savevm-async.patch} (100%) rename debian/patches/pve/{0018-PVE-add-savevm-async-for-background-state-snapshots.patch => 0017-PVE-add-savevm-async-for-background-state-snapshots.patch} (100%) rename debian/patches/pve/{0019-PVE-add-optional-buffer-size-to-QEMUFile.patch => 0018-PVE-add-optional-buffer-size-to-QEMUFile.patch} (100%) rename debian/patches/pve/{0020-PVE-block-add-the-zeroinit-block-driver-filter.patch => 0019-PVE-block-add-the-zeroinit-block-driver-filter.patch} (100%) rename debian/patches/pve/{0021-PVE-Add-dummy-id-command-line-parameter.patch => 0020-PVE-Add-dummy-id-command-line-parameter.patch} (100%) rename debian/patches/pve/{0022-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch => 0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch} (100%) rename debian/patches/pve/{0023-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch => 0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch} (100%) rename debian/patches/pve/{0024-PVE-monitor-disable-oob-capability.patch => 0023-PVE-monitor-disable-oob-capability.patch} (100%) rename debian/patches/pve/{0025-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch => 0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch} (100%) rename debian/patches/pve/{0026-PVE-Allow-version-code-in-machine-type.patch => 0025-PVE-Allow-version-code-in-machine-type.patch} (100%) rename debian/patches/pve/{0027-block-backup-move-bcs-bitmap-initialization-to-job-c.patch => 0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch} (100%) rename debian/patches/pve/{0028-PVE-Backup-add-vma-backup-format-code.patch => 0027-PVE-Backup-add-vma-backup-format-code.patch} (100%) rename debian/patches/pve/{0029-PVE-Backup-add-backup-dump-block-driver.patch => 0028-PVE-Backup-add-backup-dump-block-driver.patch} (100%) rename debian/patches/pve/{0030-PVE-Add-sequential-job-transaction-support.patch => 0029-PVE-Add-sequential-job-transaction-support.patch} (100%) rename debian/patches/pve/{0031-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch => 0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch} (100%) rename debian/patches/pve/{0032-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch => 0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch} (100%) rename debian/patches/pve/{0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch => 0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch} (99%) rename debian/patches/pve/{0034-PVE-redirect-stderr-to-journal-when-daemonized.patch => 0033-PVE-redirect-stderr-to-journal-when-daemonized.patch} (100%) rename debian/patches/pve/{0035-PVE-Migrate-dirty-bitmap-state-via-savevm.patch => 0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch} (100%) rename debian/patches/pve/{0036-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch => 0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch} (100%) rename debian/patches/pve/{0037-PVE-fall-back-to-open-iscsi-initiatorname.patch => 0036-PVE-fall-back-to-open-iscsi-initiatorname.patch} (100%) rename debian/patches/pve/{0038-PVE-block-stream-increase-chunk-size.patch => 0037-PVE-block-stream-increase-chunk-size.patch} (100%) rename debian/patches/pve/{0039-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch => 0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch} (100%) rename debian/patches/pve/{0040-block-add-alloc-track-driver.patch => 0039-block-add-alloc-track-driver.patch} (100%) rename debian/patches/pve/{0041-Revert-block-rbd-workaround-for-ceph-issue-53784.patch => 0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch} (100%) rename debian/patches/pve/{0042-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch => 0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch} (100%) rename debian/patches/pve/{0043-Revert-block-rbd-implement-bdrv_co_block_status.patch => 0042-Revert-block-rbd-implement-bdrv_co_block_status.patch} (100%) rename debian/patches/pve/{0044-alloc-track-fix-deadlock-during-drop.patch => 0043-alloc-track-fix-deadlock-during-drop.patch} (100%) rename debian/patches/pve/{0045-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch => 0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch} (100%) rename debian/patches/pve/{0046-savevm-async-don-t-hold-BQL-during-setup.patch => 0045-savevm-async-don-t-hold-BQL-during-setup.patch} (100%) diff --git a/debian/patches/pve/0008-PVE-Up-glusterfs-allow-partial-reads.patch b/debian/patches/pve/0007-PVE-Up-glusterfs-allow-partial-reads.patch similarity index 100% rename from debian/patches/pve/0008-PVE-Up-glusterfs-allow-partial-reads.patch rename to debian/patches/pve/0007-PVE-Up-glusterfs-allow-partial-reads.patch 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 deleted file mode 100644 index 50c66f4..0000000 --- a/debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bumiller -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 | 2 ++ - 3 files changed, 44 insertions(+) - -diff --git a/net/net.c b/net/net.c -index 6492ad530e..33e901cba8 100644 ---- a/net/net.c -+++ b/net/net.c -@@ -1397,6 +1397,33 @@ RxFilterInfoList *qmp_query_rx_filter(const char *name, Error **errp) - return filter_list; - } - -+int64_t qmp_get_link_status(const char *name, Error **errp) -+{ -+ NetClientState *ncs[MAX_QUEUE_NUM]; -+ NetClientState *nc; -+ int queues; -+ bool ret; -+ -+ queues = qemu_find_net_clients_except(name, ncs, -+ NET_CLIENT_DRIVER__MAX, -+ MAX_QUEUE_NUM); -+ -+ if (queues == 0) { -+ error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, -+ "Device '%s' not found", name); -+ return (int64_t) -1; -+ } -+ -+ nc = ncs[0]; -+ ret = ncs[0]->link_down; -+ -+ if (nc->peer->info->type == NET_CLIENT_DRIVER_NIC) { -+ ret = ncs[0]->peer->link_down; -+ } -+ -+ return (int64_t) ret ? 0 : 1; -+} -+ - void colo_notify_filters_event(int event, Error **errp) - { - NetClientState *nc; -diff --git a/qapi/net.json b/qapi/net.json -index d6eb30008b..4fe71b149d 100644 ---- a/qapi/net.json -+++ b/qapi/net.json -@@ -36,6 +36,21 @@ - ## - { 'command': 'set_link', 'data': {'name': 'str', 'up': 'bool'} } - -+## -+# @get_link_status: -+# -+# Get the current link state of the nics or nic. -+# -+# @name: name of the nic you get the state of -+# -+# Return: If link is up 1 -+# If link is down 0 -+# If an error occure an empty string. -+# -+# Notes: this is an Proxmox VE extension and not offical part of Qemu. -+## -+{ 'command': 'get_link_status', 'data': {'name': 'str'} , 'returns': 'int' } -+ - ## - # @netdev_add: - # -diff --git a/qapi/pragma.json b/qapi/pragma.json -index 7f810b0e97..29233db825 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', -@@ -26,6 +27,7 @@ - 'system_wakeup' ], - # Commands allowed to return a non-dictionary - 'command-returns-exceptions': [ -+ 'get_link_status', - 'human-monitor-command', - 'qom-get', - 'query-tpm-models', diff --git a/debian/patches/pve/0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch b/debian/patches/pve/0008-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch similarity index 100% rename from debian/patches/pve/0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch rename to debian/patches/pve/0008-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch diff --git a/debian/patches/pve/0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch b/debian/patches/pve/0009-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch similarity index 100% rename from debian/patches/pve/0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch rename to debian/patches/pve/0009-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch diff --git a/debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch b/debian/patches/pve/0010-PVE-Up-qemu-img-dd-add-isize-parameter.patch similarity index 100% rename from debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch rename to debian/patches/pve/0010-PVE-Up-qemu-img-dd-add-isize-parameter.patch diff --git a/debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch b/debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-n-skip_create.patch similarity index 100% rename from debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch rename to debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-n-skip_create.patch diff --git a/debian/patches/pve/0013-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch b/debian/patches/pve/0012-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch similarity index 100% rename from debian/patches/pve/0013-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch rename to debian/patches/pve/0012-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch diff --git a/debian/patches/pve/0014-PVE-virtio-balloon-improve-query-balloon.patch b/debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch similarity index 99% rename from debian/patches/pve/0014-PVE-virtio-balloon-improve-query-balloon.patch rename to debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch index 183c9dc..b465314 100644 --- a/debian/patches/pve/0014-PVE-virtio-balloon-improve-query-balloon.patch +++ b/debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch @@ -138,10 +138,10 @@ index 604b686e59..15f5f86683 100644 ## # @query-balloon: diff --git a/qapi/pragma.json b/qapi/pragma.json -index 29233db825..f2097b9020 100644 +index 7f810b0e97..325e684411 100644 --- a/qapi/pragma.json +++ b/qapi/pragma.json -@@ -37,6 +37,7 @@ +@@ -35,6 +35,7 @@ 'member-name-exceptions': [ # visible in: 'ACPISlotType', # query-acpi-ospm-status 'AcpiTableOptions', # -acpitable diff --git a/debian/patches/pve/0015-PVE-qapi-modify-query-machines.patch b/debian/patches/pve/0014-PVE-qapi-modify-query-machines.patch similarity index 100% rename from debian/patches/pve/0015-PVE-qapi-modify-query-machines.patch rename to debian/patches/pve/0014-PVE-qapi-modify-query-machines.patch diff --git a/debian/patches/pve/0016-PVE-qapi-modify-spice-query.patch b/debian/patches/pve/0015-PVE-qapi-modify-spice-query.patch similarity index 100% rename from debian/patches/pve/0016-PVE-qapi-modify-spice-query.patch rename to debian/patches/pve/0015-PVE-qapi-modify-spice-query.patch diff --git a/debian/patches/pve/0017-PVE-add-IOChannel-implementation-for-savevm-async.patch b/debian/patches/pve/0016-PVE-add-IOChannel-implementation-for-savevm-async.patch similarity index 100% rename from debian/patches/pve/0017-PVE-add-IOChannel-implementation-for-savevm-async.patch rename to debian/patches/pve/0016-PVE-add-IOChannel-implementation-for-savevm-async.patch diff --git a/debian/patches/pve/0018-PVE-add-savevm-async-for-background-state-snapshots.patch b/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch similarity index 100% rename from debian/patches/pve/0018-PVE-add-savevm-async-for-background-state-snapshots.patch rename to debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch diff --git a/debian/patches/pve/0019-PVE-add-optional-buffer-size-to-QEMUFile.patch b/debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch similarity index 100% rename from debian/patches/pve/0019-PVE-add-optional-buffer-size-to-QEMUFile.patch rename to debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch diff --git a/debian/patches/pve/0020-PVE-block-add-the-zeroinit-block-driver-filter.patch b/debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch similarity index 100% rename from debian/patches/pve/0020-PVE-block-add-the-zeroinit-block-driver-filter.patch rename to debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch diff --git a/debian/patches/pve/0021-PVE-Add-dummy-id-command-line-parameter.patch b/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch similarity index 100% rename from debian/patches/pve/0021-PVE-Add-dummy-id-command-line-parameter.patch rename to debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch diff --git a/debian/patches/pve/0022-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch b/debian/patches/pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch similarity index 100% rename from debian/patches/pve/0022-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch rename to debian/patches/pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch diff --git a/debian/patches/pve/0023-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 similarity index 100% rename from debian/patches/pve/0023-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch rename to debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch diff --git a/debian/patches/pve/0024-PVE-monitor-disable-oob-capability.patch b/debian/patches/pve/0023-PVE-monitor-disable-oob-capability.patch similarity index 100% rename from debian/patches/pve/0024-PVE-monitor-disable-oob-capability.patch rename to debian/patches/pve/0023-PVE-monitor-disable-oob-capability.patch diff --git a/debian/patches/pve/0025-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch b/debian/patches/pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch similarity index 100% rename from debian/patches/pve/0025-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch rename to debian/patches/pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch diff --git a/debian/patches/pve/0026-PVE-Allow-version-code-in-machine-type.patch b/debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch similarity index 100% rename from debian/patches/pve/0026-PVE-Allow-version-code-in-machine-type.patch rename to debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch diff --git a/debian/patches/pve/0027-block-backup-move-bcs-bitmap-initialization-to-job-c.patch b/debian/patches/pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch similarity index 100% rename from debian/patches/pve/0027-block-backup-move-bcs-bitmap-initialization-to-job-c.patch rename to debian/patches/pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch diff --git a/debian/patches/pve/0028-PVE-Backup-add-vma-backup-format-code.patch b/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch similarity index 100% rename from debian/patches/pve/0028-PVE-Backup-add-vma-backup-format-code.patch rename to debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch diff --git a/debian/patches/pve/0029-PVE-Backup-add-backup-dump-block-driver.patch b/debian/patches/pve/0028-PVE-Backup-add-backup-dump-block-driver.patch similarity index 100% rename from debian/patches/pve/0029-PVE-Backup-add-backup-dump-block-driver.patch rename to debian/patches/pve/0028-PVE-Backup-add-backup-dump-block-driver.patch diff --git a/debian/patches/pve/0030-PVE-Add-sequential-job-transaction-support.patch b/debian/patches/pve/0029-PVE-Add-sequential-job-transaction-support.patch similarity index 100% rename from debian/patches/pve/0030-PVE-Add-sequential-job-transaction-support.patch rename to debian/patches/pve/0029-PVE-Add-sequential-job-transaction-support.patch diff --git a/debian/patches/pve/0031-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch b/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch similarity index 100% rename from debian/patches/pve/0031-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch rename to debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch diff --git a/debian/patches/pve/0032-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch b/debian/patches/pve/0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch similarity index 100% rename from debian/patches/pve/0032-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch rename to debian/patches/pve/0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch diff --git a/debian/patches/pve/0033-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 similarity index 99% rename from debian/patches/pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch rename to debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch index 9c9dc26..63b4161 100644 --- a/debian/patches/pve/0033-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 @@ -441,10 +441,10 @@ index 4ec70acf95..47118bf83e 100644 'nvme-io_uring': { 'type': 'BlockdevOptionsNvmeIoUring', 'if': 'CONFIG_BLKIO' }, diff --git a/qapi/pragma.json b/qapi/pragma.json -index f2097b9020..5ab1890519 100644 +index 325e684411..b6079f6a0e 100644 --- a/qapi/pragma.json +++ b/qapi/pragma.json -@@ -47,6 +47,7 @@ +@@ -45,6 +45,7 @@ 'BlockInfo', # query-block 'BlockdevAioOptions', # blockdev-add, -blockdev 'BlockdevDriver', # blockdev-add, query-blockstats, ... diff --git a/debian/patches/pve/0034-PVE-redirect-stderr-to-journal-when-daemonized.patch b/debian/patches/pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch similarity index 100% rename from debian/patches/pve/0034-PVE-redirect-stderr-to-journal-when-daemonized.patch rename to debian/patches/pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch diff --git a/debian/patches/pve/0035-PVE-Migrate-dirty-bitmap-state-via-savevm.patch b/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch similarity index 100% rename from debian/patches/pve/0035-PVE-Migrate-dirty-bitmap-state-via-savevm.patch rename to debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch diff --git a/debian/patches/pve/0036-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch b/debian/patches/pve/0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch similarity index 100% rename from debian/patches/pve/0036-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch rename to debian/patches/pve/0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch diff --git a/debian/patches/pve/0037-PVE-fall-back-to-open-iscsi-initiatorname.patch b/debian/patches/pve/0036-PVE-fall-back-to-open-iscsi-initiatorname.patch similarity index 100% rename from debian/patches/pve/0037-PVE-fall-back-to-open-iscsi-initiatorname.patch rename to debian/patches/pve/0036-PVE-fall-back-to-open-iscsi-initiatorname.patch diff --git a/debian/patches/pve/0038-PVE-block-stream-increase-chunk-size.patch b/debian/patches/pve/0037-PVE-block-stream-increase-chunk-size.patch similarity index 100% rename from debian/patches/pve/0038-PVE-block-stream-increase-chunk-size.patch rename to debian/patches/pve/0037-PVE-block-stream-increase-chunk-size.patch diff --git a/debian/patches/pve/0039-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch b/debian/patches/pve/0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch similarity index 100% rename from debian/patches/pve/0039-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch rename to debian/patches/pve/0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch diff --git a/debian/patches/pve/0040-block-add-alloc-track-driver.patch b/debian/patches/pve/0039-block-add-alloc-track-driver.patch similarity index 100% rename from debian/patches/pve/0040-block-add-alloc-track-driver.patch rename to debian/patches/pve/0039-block-add-alloc-track-driver.patch diff --git a/debian/patches/pve/0041-Revert-block-rbd-workaround-for-ceph-issue-53784.patch b/debian/patches/pve/0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch similarity index 100% rename from debian/patches/pve/0041-Revert-block-rbd-workaround-for-ceph-issue-53784.patch rename to debian/patches/pve/0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch diff --git a/debian/patches/pve/0042-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch b/debian/patches/pve/0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch similarity index 100% rename from debian/patches/pve/0042-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch rename to debian/patches/pve/0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch diff --git a/debian/patches/pve/0043-Revert-block-rbd-implement-bdrv_co_block_status.patch b/debian/patches/pve/0042-Revert-block-rbd-implement-bdrv_co_block_status.patch similarity index 100% rename from debian/patches/pve/0043-Revert-block-rbd-implement-bdrv_co_block_status.patch rename to debian/patches/pve/0042-Revert-block-rbd-implement-bdrv_co_block_status.patch diff --git a/debian/patches/pve/0044-alloc-track-fix-deadlock-during-drop.patch b/debian/patches/pve/0043-alloc-track-fix-deadlock-during-drop.patch similarity index 100% rename from debian/patches/pve/0044-alloc-track-fix-deadlock-during-drop.patch rename to debian/patches/pve/0043-alloc-track-fix-deadlock-during-drop.patch diff --git a/debian/patches/pve/0045-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch b/debian/patches/pve/0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch similarity index 100% rename from debian/patches/pve/0045-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch rename to debian/patches/pve/0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch diff --git a/debian/patches/pve/0046-savevm-async-don-t-hold-BQL-during-setup.patch b/debian/patches/pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch similarity index 100% rename from debian/patches/pve/0046-savevm-async-don-t-hold-BQL-during-setup.patch rename to debian/patches/pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch diff --git a/debian/patches/series b/debian/patches/series index 32c51a1..c9c96d7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,43 +19,42 @@ pve/0003-PVE-Config-set-the-CPU-model-to-kvm64-32-instead-of-.patch pve/0004-PVE-Config-ui-spice-default-to-pve-certificates.patch pve/0005-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch pve/0006-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch -pve/0007-PVE-Up-qmp-add-get_link_status.patch -pve/0008-PVE-Up-glusterfs-allow-partial-reads.patch -pve/0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch -pve/0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch -pve/0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch -pve/0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch -pve/0013-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch -pve/0014-PVE-virtio-balloon-improve-query-balloon.patch -pve/0015-PVE-qapi-modify-query-machines.patch -pve/0016-PVE-qapi-modify-spice-query.patch -pve/0017-PVE-add-IOChannel-implementation-for-savevm-async.patch -pve/0018-PVE-add-savevm-async-for-background-state-snapshots.patch -pve/0019-PVE-add-optional-buffer-size-to-QEMUFile.patch -pve/0020-PVE-block-add-the-zeroinit-block-driver-filter.patch -pve/0021-PVE-Add-dummy-id-command-line-parameter.patch -pve/0022-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch -pve/0023-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch -pve/0024-PVE-monitor-disable-oob-capability.patch -pve/0025-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch -pve/0026-PVE-Allow-version-code-in-machine-type.patch -pve/0027-block-backup-move-bcs-bitmap-initialization-to-job-c.patch -pve/0028-PVE-Backup-add-vma-backup-format-code.patch -pve/0029-PVE-Backup-add-backup-dump-block-driver.patch -pve/0030-PVE-Add-sequential-job-transaction-support.patch -pve/0031-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch -pve/0032-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch -pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch -pve/0034-PVE-redirect-stderr-to-journal-when-daemonized.patch -pve/0035-PVE-Migrate-dirty-bitmap-state-via-savevm.patch -pve/0036-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch -pve/0037-PVE-fall-back-to-open-iscsi-initiatorname.patch -pve/0038-PVE-block-stream-increase-chunk-size.patch -pve/0039-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch -pve/0040-block-add-alloc-track-driver.patch -pve/0041-Revert-block-rbd-workaround-for-ceph-issue-53784.patch -pve/0042-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch -pve/0043-Revert-block-rbd-implement-bdrv_co_block_status.patch -pve/0044-alloc-track-fix-deadlock-during-drop.patch -pve/0045-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch -pve/0046-savevm-async-don-t-hold-BQL-during-setup.patch +pve/0007-PVE-Up-glusterfs-allow-partial-reads.patch +pve/0008-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch +pve/0009-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch +pve/0010-PVE-Up-qemu-img-dd-add-isize-parameter.patch +pve/0011-PVE-Up-qemu-img-dd-add-n-skip_create.patch +pve/0012-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch +pve/0013-PVE-virtio-balloon-improve-query-balloon.patch +pve/0014-PVE-qapi-modify-query-machines.patch +pve/0015-PVE-qapi-modify-spice-query.patch +pve/0016-PVE-add-IOChannel-implementation-for-savevm-async.patch +pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch +pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch +pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch +pve/0020-PVE-Add-dummy-id-command-line-parameter.patch +pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch +pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch +pve/0023-PVE-monitor-disable-oob-capability.patch +pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch +pve/0025-PVE-Allow-version-code-in-machine-type.patch +pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch +pve/0027-PVE-Backup-add-vma-backup-format-code.patch +pve/0028-PVE-Backup-add-backup-dump-block-driver.patch +pve/0029-PVE-Add-sequential-job-transaction-support.patch +pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch +pve/0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch +pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch +pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch +pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch +pve/0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch +pve/0036-PVE-fall-back-to-open-iscsi-initiatorname.patch +pve/0037-PVE-block-stream-increase-chunk-size.patch +pve/0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch +pve/0039-block-add-alloc-track-driver.patch +pve/0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch +pve/0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch +pve/0042-Revert-block-rbd-implement-bdrv_co_block_status.patch +pve/0043-alloc-track-fix-deadlock-during-drop.patch +pve/0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch +pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch