From 277d33454f77ec1d1e0bc04e37621e4dd2424b67 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 10 Aug 2021 09:55:11 +0200 Subject: [PATCH] drop patch force-disabling smm This drops debian/patches/pve/0005-PVE-Config-smm_available-false.patch (and renumbers the remaining patches) From what I could gather, this patch was originally added due to issues with old kernels. Now we have users which seem to run into issues *with* the patch. All this does is toggle an option, and it's available via a qemu CLI option anyway, so if dropping this patch causes issues for some people we can just add an option to qemu-server & UI control smm explicitly. Signed-off-by: Wolfgang Bumiller Cc: Alexandre Derumier Tested-by: Stefan Reiter --- ...rfs-no-default-logfile-if-daemonize.patch} | 0 .../0005-PVE-Config-smm_available-false.patch | 24 ----- ...ock-rbd-disable-rbd_cache_writethro.patch} | 0 ...0007-PVE-Up-qmp-add-get_link_status.patch} | 0 ...VE-Up-glusterfs-allow-partial-reads.patch} | 0 ...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 ...irtio-balloon-improve-query-balloon.patch} | 0 ...0014-PVE-qapi-modify-query-machines.patch} | 0 ...=> 0015-PVE-qapi-modify-spice-query.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 ...E-Backup-add-vma-backup-format-code.patch} | 0 ...Backup-add-backup-dump-block-driver.patch} | 0 ...kup-proxmox-backup-patches-for-qemu.patch} | 2 +- ...store-new-command-to-restore-from-p.patch} | 0 ...rty-bitmap-tracking-for-incremental.patch} | 2 +- ...patch => 0030-PVE-various-PBS-fixes.patch} | 2 +- ...-driver-to-map-backup-archives-into.patch} | 0 ...d-query_proxmox_support-QMP-command.patch} | 2 +- ...-add-query-pbs-bitmap-info-QMP-call.patch} | 2 +- ...t-stderr-to-journal-when-daemonized.patch} | 0 ...-sequential-job-transaction-support.patch} | 0 ...transaction-to-synchronize-job-stat.patch} | 2 +- ...block-on-finishing-and-cleanup-crea.patch} | 2 +- ...grate-dirty-bitmap-state-via-savevm.patch} | 2 +- ...irty-bitmap-migrate-other-bitmaps-e.patch} | 0 ...ll-back-to-open-iscsi-initiatorname.patch} | 0 ...outine-QMP-for-backup-cancel_backup.patch} | 2 +- ... => 0042-PBS-add-master-key-support.patch} | 2 +- ...t-path-reads-without-allocation-if-.patch} | 0 ...VE-block-stream-increase-chunk-size.patch} | 0 ...ccept-NULL-qiov-in-bdrv_pad_request.patch} | 0 ...> 0046-block-add-alloc-track-driver.patch} | 0 ...alid-QAPI-names-for-backwards-compa.patch} | 0 ...register-yank-before-migration_inco.patch} | 0 debian/patches/series | 89 +++++++++---------- 46 files changed, 54 insertions(+), 79 deletions(-) rename debian/patches/pve/{0006-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch => 0005-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch} (100%) delete mode 100644 debian/patches/pve/0005-PVE-Config-smm_available-false.patch rename debian/patches/pve/{0007-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch => 0006-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch} (100%) rename debian/patches/pve/{0008-PVE-Up-qmp-add-get_link_status.patch => 0007-PVE-Up-qmp-add-get_link_status.patch} (100%) rename debian/patches/pve/{0009-PVE-Up-glusterfs-allow-partial-reads.patch => 0008-PVE-Up-glusterfs-allow-partial-reads.patch} (100%) rename debian/patches/pve/{0010-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch => 0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch} (100%) rename debian/patches/pve/{0011-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch => 0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch} (100%) rename debian/patches/pve/{0012-PVE-Up-qemu-img-dd-add-isize-parameter.patch => 0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch} (100%) rename debian/patches/pve/{0013-PVE-Up-qemu-img-dd-add-n-skip_create.patch => 0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch} (100%) rename debian/patches/pve/{0014-PVE-virtio-balloon-improve-query-balloon.patch => 0013-PVE-virtio-balloon-improve-query-balloon.patch} (100%) 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-savevm-async-for-background-state-snapshots.patch => 0016-PVE-add-savevm-async-for-background-state-snapshots.patch} (100%) rename debian/patches/pve/{0018-PVE-add-optional-buffer-size-to-QEMUFile.patch => 0017-PVE-add-optional-buffer-size-to-QEMUFile.patch} (100%) rename debian/patches/pve/{0019-PVE-block-add-the-zeroinit-block-driver-filter.patch => 0018-PVE-block-add-the-zeroinit-block-driver-filter.patch} (100%) rename debian/patches/pve/{0020-PVE-Add-dummy-id-command-line-parameter.patch => 0019-PVE-Add-dummy-id-command-line-parameter.patch} (100%) rename debian/patches/pve/{0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch => 0020-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch} (100%) rename debian/patches/pve/{0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch => 0021-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch} (100%) rename debian/patches/pve/{0023-PVE-monitor-disable-oob-capability.patch => 0022-PVE-monitor-disable-oob-capability.patch} (100%) rename debian/patches/pve/{0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch => 0023-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch} (100%) rename debian/patches/pve/{0025-PVE-Allow-version-code-in-machine-type.patch => 0024-PVE-Allow-version-code-in-machine-type.patch} (100%) rename debian/patches/pve/{0026-PVE-Backup-add-vma-backup-format-code.patch => 0025-PVE-Backup-add-vma-backup-format-code.patch} (100%) rename debian/patches/pve/{0027-PVE-Backup-add-backup-dump-block-driver.patch => 0026-PVE-Backup-add-backup-dump-block-driver.patch} (100%) rename debian/patches/pve/{0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch => 0027-PVE-Backup-proxmox-backup-patches-for-qemu.patch} (99%) rename debian/patches/pve/{0029-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch => 0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch} (100%) rename debian/patches/pve/{0030-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch => 0029-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch} (99%) rename debian/patches/pve/{0031-PVE-various-PBS-fixes.patch => 0030-PVE-various-PBS-fixes.patch} (99%) rename debian/patches/pve/{0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch => 0031-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch} (100%) rename debian/patches/pve/{0033-PVE-add-query_proxmox_support-QMP-command.patch => 0032-PVE-add-query_proxmox_support-QMP-command.patch} (98%) rename debian/patches/pve/{0034-PVE-add-query-pbs-bitmap-info-QMP-call.patch => 0033-PVE-add-query-pbs-bitmap-info-QMP-call.patch} (99%) rename debian/patches/pve/{0035-PVE-redirect-stderr-to-journal-when-daemonized.patch => 0034-PVE-redirect-stderr-to-journal-when-daemonized.patch} (100%) rename debian/patches/pve/{0036-PVE-Add-sequential-job-transaction-support.patch => 0035-PVE-Add-sequential-job-transaction-support.patch} (100%) rename debian/patches/pve/{0037-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch => 0036-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch} (99%) rename debian/patches/pve/{0038-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch => 0037-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch} (99%) rename debian/patches/pve/{0039-PVE-Migrate-dirty-bitmap-state-via-savevm.patch => 0038-PVE-Migrate-dirty-bitmap-state-via-savevm.patch} (99%) rename debian/patches/pve/{0040-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch => 0039-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch} (100%) rename debian/patches/pve/{0041-PVE-fall-back-to-open-iscsi-initiatorname.patch => 0040-PVE-fall-back-to-open-iscsi-initiatorname.patch} (100%) rename debian/patches/pve/{0042-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch => 0041-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch} (99%) rename debian/patches/pve/{0043-PBS-add-master-key-support.patch => 0042-PBS-add-master-key-support.patch} (99%) rename debian/patches/pve/{0044-PVE-block-pbs-fast-path-reads-without-allocation-if-.patch => 0043-PVE-block-pbs-fast-path-reads-without-allocation-if-.patch} (100%) rename debian/patches/pve/{0045-PVE-block-stream-increase-chunk-size.patch => 0044-PVE-block-stream-increase-chunk-size.patch} (100%) rename debian/patches/pve/{0046-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch => 0045-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch} (100%) rename debian/patches/pve/{0047-block-add-alloc-track-driver.patch => 0046-block-add-alloc-track-driver.patch} (100%) rename debian/patches/pve/{0048-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch => 0047-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch} (100%) rename debian/patches/pve/{0049-PVE-savevm-async-register-yank-before-migration_inco.patch => 0048-PVE-savevm-async-register-yank-before-migration_inco.patch} (100%) diff --git a/debian/patches/pve/0006-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch b/debian/patches/pve/0005-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch similarity index 100% rename from debian/patches/pve/0006-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch rename to debian/patches/pve/0005-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch diff --git a/debian/patches/pve/0005-PVE-Config-smm_available-false.patch b/debian/patches/pve/0005-PVE-Config-smm_available-false.patch deleted file mode 100644 index a661926..0000000 --- a/debian/patches/pve/0005-PVE-Config-smm_available-false.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alexandre Derumier -Date: Mon, 6 Apr 2020 12:16:34 +0200 -Subject: [PATCH] PVE: [Config] smm_available = false - -Signed-off-by: Alexandre Derumier -Signed-off-by: Thomas Lamprecht ---- - hw/i386/x86.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/i386/x86.c b/hw/i386/x86.c -index ed796fe6ba..455ee54bae 100644 ---- a/hw/i386/x86.c -+++ b/hw/i386/x86.c -@@ -1145,7 +1145,7 @@ bool x86_machine_is_smm_enabled(const X86MachineState *x86ms) - if (tcg_enabled() || qtest_enabled()) { - smm_available = true; - } else if (kvm_enabled()) { -- smm_available = kvm_has_smm(); -+ smm_available = false; - } - - if (smm_available) { diff --git a/debian/patches/pve/0007-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch b/debian/patches/pve/0006-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch similarity index 100% rename from debian/patches/pve/0007-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch rename to debian/patches/pve/0006-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch diff --git a/debian/patches/pve/0008-PVE-Up-qmp-add-get_link_status.patch b/debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch similarity index 100% rename from debian/patches/pve/0008-PVE-Up-qmp-add-get_link_status.patch rename to debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch diff --git a/debian/patches/pve/0009-PVE-Up-glusterfs-allow-partial-reads.patch b/debian/patches/pve/0008-PVE-Up-glusterfs-allow-partial-reads.patch similarity index 100% rename from debian/patches/pve/0009-PVE-Up-glusterfs-allow-partial-reads.patch rename to debian/patches/pve/0008-PVE-Up-glusterfs-allow-partial-reads.patch diff --git a/debian/patches/pve/0010-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch b/debian/patches/pve/0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch similarity index 100% rename from debian/patches/pve/0010-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch rename to debian/patches/pve/0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch diff --git a/debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch b/debian/patches/pve/0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch similarity index 100% rename from debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch rename to debian/patches/pve/0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch diff --git a/debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-isize-parameter.patch b/debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch similarity index 100% rename from debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-isize-parameter.patch rename to debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch diff --git a/debian/patches/pve/0013-PVE-Up-qemu-img-dd-add-n-skip_create.patch b/debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch similarity index 100% rename from debian/patches/pve/0013-PVE-Up-qemu-img-dd-add-n-skip_create.patch rename to debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-n-skip_create.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 100% 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 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-savevm-async-for-background-state-snapshots.patch b/debian/patches/pve/0016-PVE-add-savevm-async-for-background-state-snapshots.patch similarity index 100% rename from debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch rename to debian/patches/pve/0016-PVE-add-savevm-async-for-background-state-snapshots.patch diff --git a/debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch b/debian/patches/pve/0017-PVE-add-optional-buffer-size-to-QEMUFile.patch similarity index 100% rename from debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch rename to debian/patches/pve/0017-PVE-add-optional-buffer-size-to-QEMUFile.patch diff --git a/debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch b/debian/patches/pve/0018-PVE-block-add-the-zeroinit-block-driver-filter.patch similarity index 100% rename from debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch rename to debian/patches/pve/0018-PVE-block-add-the-zeroinit-block-driver-filter.patch diff --git a/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch b/debian/patches/pve/0019-PVE-Add-dummy-id-command-line-parameter.patch similarity index 100% rename from debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch rename to debian/patches/pve/0019-PVE-Add-dummy-id-command-line-parameter.patch diff --git a/debian/patches/pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch b/debian/patches/pve/0020-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch similarity index 100% rename from debian/patches/pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch rename to debian/patches/pve/0020-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch diff --git a/debian/patches/pve/0022-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 similarity index 100% rename from debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch rename to debian/patches/pve/0021-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch diff --git a/debian/patches/pve/0023-PVE-monitor-disable-oob-capability.patch b/debian/patches/pve/0022-PVE-monitor-disable-oob-capability.patch similarity index 100% rename from debian/patches/pve/0023-PVE-monitor-disable-oob-capability.patch rename to debian/patches/pve/0022-PVE-monitor-disable-oob-capability.patch diff --git a/debian/patches/pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch b/debian/patches/pve/0023-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch similarity index 100% rename from debian/patches/pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch rename to debian/patches/pve/0023-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch diff --git a/debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch b/debian/patches/pve/0024-PVE-Allow-version-code-in-machine-type.patch similarity index 100% rename from debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch rename to debian/patches/pve/0024-PVE-Allow-version-code-in-machine-type.patch diff --git a/debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch b/debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch similarity index 100% rename from debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch rename to debian/patches/pve/0025-PVE-Backup-add-vma-backup-format-code.patch diff --git a/debian/patches/pve/0027-PVE-Backup-add-backup-dump-block-driver.patch b/debian/patches/pve/0026-PVE-Backup-add-backup-dump-block-driver.patch similarity index 100% rename from debian/patches/pve/0027-PVE-Backup-add-backup-dump-block-driver.patch rename to debian/patches/pve/0026-PVE-Backup-add-backup-dump-block-driver.patch diff --git a/debian/patches/pve/0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch b/debian/patches/pve/0027-PVE-Backup-proxmox-backup-patches-for-qemu.patch similarity index 99% rename from debian/patches/pve/0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch rename to debian/patches/pve/0027-PVE-Backup-proxmox-backup-patches-for-qemu.patch index 2484b56..5e40bca 100644 --- a/debian/patches/pve/0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch +++ b/debian/patches/pve/0027-PVE-Backup-proxmox-backup-patches-for-qemu.patch @@ -510,7 +510,7 @@ index 0000000000..1dda8b7d8f +#endif /* PROXMOX_BACKUP_CLIENT_H */ diff --git a/pve-backup.c b/pve-backup.c new file mode 100644 -index 0000000000..f9fe6adb55 +index 0000000000..66868dec14 --- /dev/null +++ b/pve-backup.c @@ -0,0 +1,959 @@ diff --git a/debian/patches/pve/0029-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch b/debian/patches/pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch similarity index 100% rename from debian/patches/pve/0029-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch rename to debian/patches/pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch diff --git a/debian/patches/pve/0030-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch b/debian/patches/pve/0029-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch similarity index 99% rename from debian/patches/pve/0030-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch rename to debian/patches/pve/0029-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch index 3b728bb..11506fc 100644 --- a/debian/patches/pve/0030-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch +++ b/debian/patches/pve/0029-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch @@ -132,7 +132,7 @@ index 1dda8b7d8f..8cbf645b2c 100644 diff --git a/pve-backup.c b/pve-backup.c -index f9fe6adb55..98fd28a8f2 100644 +index 66868dec14..6cdbd40529 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -28,6 +28,8 @@ diff --git a/debian/patches/pve/0031-PVE-various-PBS-fixes.patch b/debian/patches/pve/0030-PVE-various-PBS-fixes.patch similarity index 99% rename from debian/patches/pve/0031-PVE-various-PBS-fixes.patch rename to debian/patches/pve/0030-PVE-various-PBS-fixes.patch index dec4a0b..85373ea 100644 --- a/debian/patches/pve/0031-PVE-various-PBS-fixes.patch +++ b/debian/patches/pve/0030-PVE-various-PBS-fixes.patch @@ -33,7 +33,7 @@ index da5043b973..f509959a32 100644 false, NULL, false, NULL, !!devlist, devlist, qdict_haskey(qdict, "speed"), speed, &error); diff --git a/pve-backup.c b/pve-backup.c -index 98fd28a8f2..129ebd0eb4 100644 +index 6cdbd40529..7527885251 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -8,6 +8,7 @@ diff --git a/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch b/debian/patches/pve/0031-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch similarity index 100% rename from debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch rename to debian/patches/pve/0031-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch diff --git a/debian/patches/pve/0033-PVE-add-query_proxmox_support-QMP-command.patch b/debian/patches/pve/0032-PVE-add-query_proxmox_support-QMP-command.patch similarity index 98% rename from debian/patches/pve/0033-PVE-add-query_proxmox_support-QMP-command.patch rename to debian/patches/pve/0032-PVE-add-query_proxmox_support-QMP-command.patch index 7c634fc..02a1a01 100644 --- a/debian/patches/pve/0033-PVE-add-query_proxmox_support-QMP-command.patch +++ b/debian/patches/pve/0032-PVE-add-query_proxmox_support-QMP-command.patch @@ -16,7 +16,7 @@ Signed-off-by: Stefan Reiter 2 files changed, 38 insertions(+) diff --git a/pve-backup.c b/pve-backup.c -index 129ebd0eb4..96e3d731da 100644 +index 7527885251..8cba8e97d3 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -1075,3 +1075,12 @@ BackupStatus *qmp_query_backup(Error **errp) diff --git a/debian/patches/pve/0034-PVE-add-query-pbs-bitmap-info-QMP-call.patch b/debian/patches/pve/0033-PVE-add-query-pbs-bitmap-info-QMP-call.patch similarity index 99% rename from debian/patches/pve/0034-PVE-add-query-pbs-bitmap-info-QMP-call.patch rename to debian/patches/pve/0033-PVE-add-query-pbs-bitmap-info-QMP-call.patch index 907a6bb..706a4f7 100644 --- a/debian/patches/pve/0034-PVE-add-query-pbs-bitmap-info-QMP-call.patch +++ b/debian/patches/pve/0033-PVE-add-query-pbs-bitmap-info-QMP-call.patch @@ -68,7 +68,7 @@ index a6a289968f..f7a211e5a4 100644 info->zero_bytes, zero_per); diff --git a/pve-backup.c b/pve-backup.c -index 96e3d731da..032ecc2007 100644 +index 8cba8e97d3..22420db26a 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -46,6 +46,7 @@ static struct PVEBackupState { diff --git a/debian/patches/pve/0035-PVE-redirect-stderr-to-journal-when-daemonized.patch b/debian/patches/pve/0034-PVE-redirect-stderr-to-journal-when-daemonized.patch similarity index 100% rename from debian/patches/pve/0035-PVE-redirect-stderr-to-journal-when-daemonized.patch rename to debian/patches/pve/0034-PVE-redirect-stderr-to-journal-when-daemonized.patch diff --git a/debian/patches/pve/0036-PVE-Add-sequential-job-transaction-support.patch b/debian/patches/pve/0035-PVE-Add-sequential-job-transaction-support.patch similarity index 100% rename from debian/patches/pve/0036-PVE-Add-sequential-job-transaction-support.patch rename to debian/patches/pve/0035-PVE-Add-sequential-job-transaction-support.patch diff --git a/debian/patches/pve/0037-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch b/debian/patches/pve/0036-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch similarity index 99% rename from debian/patches/pve/0037-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch rename to debian/patches/pve/0036-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch index a626ea0..d7da832 100644 --- a/debian/patches/pve/0037-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch +++ b/debian/patches/pve/0036-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch @@ -16,7 +16,7 @@ Signed-off-by: Stefan Reiter 1 file changed, 49 insertions(+), 118 deletions(-) diff --git a/pve-backup.c b/pve-backup.c -index 032ecc2007..7d254cc1f6 100644 +index 22420db26a..2e628d68e4 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -52,6 +52,7 @@ static struct PVEBackupState { diff --git a/debian/patches/pve/0038-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch b/debian/patches/pve/0037-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch similarity index 99% rename from debian/patches/pve/0038-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch rename to debian/patches/pve/0037-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch index 7b11be7..654be10 100644 --- a/debian/patches/pve/0038-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch +++ b/debian/patches/pve/0037-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch @@ -54,7 +54,7 @@ Signed-off-by: Stefan Reiter 2 files changed, 144 insertions(+), 78 deletions(-) diff --git a/pve-backup.c b/pve-backup.c -index 7d254cc1f6..59b4034871 100644 +index 2e628d68e4..9c20ef3a5e 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -33,7 +33,9 @@ const char *PBS_BITMAP_NAME = "pbs-incremental-dirty-bitmap"; diff --git a/debian/patches/pve/0039-PVE-Migrate-dirty-bitmap-state-via-savevm.patch b/debian/patches/pve/0038-PVE-Migrate-dirty-bitmap-state-via-savevm.patch similarity index 99% rename from debian/patches/pve/0039-PVE-Migrate-dirty-bitmap-state-via-savevm.patch rename to debian/patches/pve/0038-PVE-Migrate-dirty-bitmap-state-via-savevm.patch index b1bbccf..9596a19 100644 --- a/debian/patches/pve/0039-PVE-Migrate-dirty-bitmap-state-via-savevm.patch +++ b/debian/patches/pve/0038-PVE-Migrate-dirty-bitmap-state-via-savevm.patch @@ -174,7 +174,7 @@ index 0000000000..29f2b3860d + NULL); +} diff --git a/pve-backup.c b/pve-backup.c -index 59b4034871..ecff792760 100644 +index 9c20ef3a5e..59ccb38ceb 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -1132,6 +1132,7 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp) diff --git a/debian/patches/pve/0040-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch b/debian/patches/pve/0039-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch similarity index 100% rename from debian/patches/pve/0040-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch rename to debian/patches/pve/0039-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch diff --git a/debian/patches/pve/0041-PVE-fall-back-to-open-iscsi-initiatorname.patch b/debian/patches/pve/0040-PVE-fall-back-to-open-iscsi-initiatorname.patch similarity index 100% rename from debian/patches/pve/0041-PVE-fall-back-to-open-iscsi-initiatorname.patch rename to debian/patches/pve/0040-PVE-fall-back-to-open-iscsi-initiatorname.patch diff --git a/debian/patches/pve/0042-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch b/debian/patches/pve/0041-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch similarity index 99% rename from debian/patches/pve/0042-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch rename to debian/patches/pve/0041-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch index 566ec06..f5eca58 100644 --- a/debian/patches/pve/0042-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch +++ b/debian/patches/pve/0041-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch @@ -115,7 +115,7 @@ index 4ce7bc0b5e..0923037dec 100644 static void proxmox_backup_schedule_wake(void *data) { CoCtxData *waker = (CoCtxData *)data; diff --git a/pve-backup.c b/pve-backup.c -index ecff792760..ed6cdc1b94 100644 +index 59ccb38ceb..f858003a06 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -357,7 +357,7 @@ static void job_cancel_bh(void *opaque) { diff --git a/debian/patches/pve/0043-PBS-add-master-key-support.patch b/debian/patches/pve/0042-PBS-add-master-key-support.patch similarity index 99% rename from debian/patches/pve/0043-PBS-add-master-key-support.patch rename to debian/patches/pve/0042-PBS-add-master-key-support.patch index 460810f..c7b81e6 100644 --- a/debian/patches/pve/0043-PBS-add-master-key-support.patch +++ b/debian/patches/pve/0042-PBS-add-master-key-support.patch @@ -30,7 +30,7 @@ index 89336d93ef..b9e659a0d2 100644 false, NULL, // PBS backup-id false, 0, // PBS backup-time diff --git a/pve-backup.c b/pve-backup.c -index ed6cdc1b94..8af161c8bf 100644 +index f858003a06..04ebfc1e33 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -533,6 +533,7 @@ UuidInfo coroutine_fn *qmp_backup( diff --git a/debian/patches/pve/0044-PVE-block-pbs-fast-path-reads-without-allocation-if-.patch b/debian/patches/pve/0043-PVE-block-pbs-fast-path-reads-without-allocation-if-.patch similarity index 100% rename from debian/patches/pve/0044-PVE-block-pbs-fast-path-reads-without-allocation-if-.patch rename to debian/patches/pve/0043-PVE-block-pbs-fast-path-reads-without-allocation-if-.patch diff --git a/debian/patches/pve/0045-PVE-block-stream-increase-chunk-size.patch b/debian/patches/pve/0044-PVE-block-stream-increase-chunk-size.patch similarity index 100% rename from debian/patches/pve/0045-PVE-block-stream-increase-chunk-size.patch rename to debian/patches/pve/0044-PVE-block-stream-increase-chunk-size.patch diff --git a/debian/patches/pve/0046-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch b/debian/patches/pve/0045-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch similarity index 100% rename from debian/patches/pve/0046-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch rename to debian/patches/pve/0045-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch diff --git a/debian/patches/pve/0047-block-add-alloc-track-driver.patch b/debian/patches/pve/0046-block-add-alloc-track-driver.patch similarity index 100% rename from debian/patches/pve/0047-block-add-alloc-track-driver.patch rename to debian/patches/pve/0046-block-add-alloc-track-driver.patch diff --git a/debian/patches/pve/0048-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch b/debian/patches/pve/0047-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch similarity index 100% rename from debian/patches/pve/0048-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch rename to debian/patches/pve/0047-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch diff --git a/debian/patches/pve/0049-PVE-savevm-async-register-yank-before-migration_inco.patch b/debian/patches/pve/0048-PVE-savevm-async-register-yank-before-migration_inco.patch similarity index 100% rename from debian/patches/pve/0049-PVE-savevm-async-register-yank-before-migration_inco.patch rename to debian/patches/pve/0048-PVE-savevm-async-register-yank-before-migration_inco.patch diff --git a/debian/patches/series b/debian/patches/series index 6edf8ce..2289085 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,48 +10,47 @@ pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch pve/0002-PVE-Config-Adjust-network-script-path-to-etc-kvm.patch 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-smm_available-false.patch -pve/0006-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch -pve/0007-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch -pve/0008-PVE-Up-qmp-add-get_link_status.patch -pve/0009-PVE-Up-glusterfs-allow-partial-reads.patch -pve/0010-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch -pve/0011-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch -pve/0012-PVE-Up-qemu-img-dd-add-isize-parameter.patch -pve/0013-PVE-Up-qemu-img-dd-add-n-skip_create.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-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-PVE-Backup-add-vma-backup-format-code.patch -pve/0027-PVE-Backup-add-backup-dump-block-driver.patch -pve/0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch -pve/0029-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch -pve/0030-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch -pve/0031-PVE-various-PBS-fixes.patch -pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch -pve/0033-PVE-add-query_proxmox_support-QMP-command.patch -pve/0034-PVE-add-query-pbs-bitmap-info-QMP-call.patch -pve/0035-PVE-redirect-stderr-to-journal-when-daemonized.patch -pve/0036-PVE-Add-sequential-job-transaction-support.patch -pve/0037-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch -pve/0038-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch -pve/0039-PVE-Migrate-dirty-bitmap-state-via-savevm.patch -pve/0040-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch -pve/0041-PVE-fall-back-to-open-iscsi-initiatorname.patch -pve/0042-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch -pve/0043-PBS-add-master-key-support.patch -pve/0044-PVE-block-pbs-fast-path-reads-without-allocation-if-.patch -pve/0045-PVE-block-stream-increase-chunk-size.patch -pve/0046-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch -pve/0047-block-add-alloc-track-driver.patch -pve/0048-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch -pve/0049-PVE-savevm-async-register-yank-before-migration_inco.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-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-savevm-async-for-background-state-snapshots.patch +pve/0017-PVE-add-optional-buffer-size-to-QEMUFile.patch +pve/0018-PVE-block-add-the-zeroinit-block-driver-filter.patch +pve/0019-PVE-Add-dummy-id-command-line-parameter.patch +pve/0020-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch +pve/0021-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch +pve/0022-PVE-monitor-disable-oob-capability.patch +pve/0023-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch +pve/0024-PVE-Allow-version-code-in-machine-type.patch +pve/0025-PVE-Backup-add-vma-backup-format-code.patch +pve/0026-PVE-Backup-add-backup-dump-block-driver.patch +pve/0027-PVE-Backup-proxmox-backup-patches-for-qemu.patch +pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch +pve/0029-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch +pve/0030-PVE-various-PBS-fixes.patch +pve/0031-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch +pve/0032-PVE-add-query_proxmox_support-QMP-command.patch +pve/0033-PVE-add-query-pbs-bitmap-info-QMP-call.patch +pve/0034-PVE-redirect-stderr-to-journal-when-daemonized.patch +pve/0035-PVE-Add-sequential-job-transaction-support.patch +pve/0036-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch +pve/0037-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch +pve/0038-PVE-Migrate-dirty-bitmap-state-via-savevm.patch +pve/0039-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch +pve/0040-PVE-fall-back-to-open-iscsi-initiatorname.patch +pve/0041-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch +pve/0042-PBS-add-master-key-support.patch +pve/0043-PVE-block-pbs-fast-path-reads-without-allocation-if-.patch +pve/0044-PVE-block-stream-increase-chunk-size.patch +pve/0045-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch +pve/0046-block-add-alloc-track-driver.patch +pve/0047-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch +pve/0048-PVE-savevm-async-register-yank-before-migration_inco.patch -- 2.39.2