From d84744618675e087c6d4b6bb0d92600b67c5fedd Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Thu, 15 Jun 2023 13:38:59 +0200 Subject: [PATCH] regenerate patches There's still some context changes not covered by earlier series. No functional change intended. Signed-off-by: Fiona Ebner --- ...VE-add-savevm-async-for-background-state-snapshots.patch | 4 ++-- .../pve/0020-PVE-Add-dummy-id-command-line-parameter.patch | 4 ++-- ...E-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch | 2 +- .../pve/0027-PVE-Backup-add-vma-backup-format-code.patch | 4 ++-- .../0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch | 2 +- ...E-Backup-pbs-restore-new-command-to-restore-from-p.patch | 4 ++-- ...E-Add-PBS-block-driver-to-map-backup-archives-into.patch | 4 ++-- ...033-PVE-redirect-stderr-to-journal-when-daemonized.patch | 6 +++--- .../0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch b/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch index 926b38d..7be1af4 100644 --- a/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch +++ b/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch @@ -802,10 +802,10 @@ index 6ddd16ea28..e5681ae8a2 100644 # @CommandLineParameterType: # diff --git a/qemu-options.hx b/qemu-options.hx -index 59bdf67a2c..fc6cb23dd9 100644 +index fdddfab6ff..fdd551c2bb 100644 --- a/qemu-options.hx +++ b/qemu-options.hx -@@ -4378,6 +4378,18 @@ SRST +@@ -4398,6 +4398,18 @@ SRST Start right away with a saved state (``loadvm`` in monitor) ERST diff --git a/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch b/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch index 3b79a3a..2c44e34 100644 --- a/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch +++ b/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch @@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 11 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx -index fc6cb23dd9..3ccedf7c45 100644 +index fdd551c2bb..4eb43b7bc5 100644 --- a/qemu-options.hx +++ b/qemu-options.hx -@@ -1150,6 +1150,9 @@ backend describes how QEMU handles the data. +@@ -1162,6 +1162,9 @@ legacy PC, they are not recommended for modern configurations. ERST diff --git a/debian/patches/pve/0024-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 index 8c76070..79008ee 100644 --- a/debian/patches/pve/0024-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 @@ -26,7 +26,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c -index 5060119952..9d1c358c12 100644 +index 2f6ccf5623..a5927e92f1 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -142,7 +142,8 @@ GlobalProperty hw_compat_4_0[] = { diff --git a/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch b/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch index 6a343c2..8471a6f 100644 --- a/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch +++ b/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch @@ -39,7 +39,7 @@ index 253fe49fa2..744b698a82 100644 softmmu_ss.add(files('block-ram-registrar.c')) diff --git a/meson.build b/meson.build -index d964e741e7..603cdb97bb 100644 +index 30447cfaef..38a4e2bcef 100644 --- a/meson.build +++ b/meson.build @@ -1527,6 +1527,8 @@ keyutils = dependency('libkeyutils', required: false, @@ -51,7 +51,7 @@ index d964e741e7..603cdb97bb 100644 # libselinux selinux = dependency('libselinux', required: get_option('selinux'), -@@ -3646,6 +3648,9 @@ if have_tools +@@ -3650,6 +3652,9 @@ if have_tools dependencies: [blockdev, qemuutil, gnutls, selinux], install: true) diff --git a/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch b/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch index cd9818d..5049256 100644 --- a/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch +++ b/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch @@ -266,7 +266,7 @@ index fdf6b45fb8..e01b2201d8 100644 void hmp_device_add(Monitor *mon, const QDict *qdict); void hmp_device_del(Monitor *mon, const QDict *qdict); diff --git a/meson.build b/meson.build -index 603cdb97bb..d307d8eabf 100644 +index 38a4e2bcef..443b3238f9 100644 --- a/meson.build +++ b/meson.build @@ -1528,6 +1528,7 @@ keyutils = dependency('libkeyutils', required: false, diff --git a/debian/patches/pve/0031-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 index 1acb93d..da798b9 100644 --- a/debian/patches/pve/0031-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 @@ -14,10 +14,10 @@ Signed-off-by: Wolfgang Bumiller create mode 100644 pbs-restore.c diff --git a/meson.build b/meson.build -index d307d8eabf..afd105001e 100644 +index 443b3238f9..32ab849ce6 100644 --- a/meson.build +++ b/meson.build -@@ -3652,6 +3652,10 @@ if have_tools +@@ -3656,6 +3656,10 @@ if have_tools vma = executable('vma', files('vma.c', 'vma-reader.c') + genh, dependencies: [authz, block, crypto, io, qom], install: true) 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 63b4161..81d33d3 100644 --- a/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch +++ b/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch @@ -390,10 +390,10 @@ index a62a3e6be9..1ac0feb46b 100755 # XXX: suppress that if [ "$bsd" = "yes" ] ; then diff --git a/meson.build b/meson.build -index afd105001e..d01ee5d489 100644 +index 32ab849ce6..69afe3441b 100644 --- a/meson.build +++ b/meson.build -@@ -4037,7 +4037,7 @@ summary_info += {'bzip2 support': libbzip2} +@@ -4041,7 +4041,7 @@ summary_info += {'bzip2 support': libbzip2} summary_info += {'lzfse support': liblzfse} summary_info += {'zstd support': zstd} summary_info += {'NUMA host support': numa} diff --git a/debian/patches/pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch b/debian/patches/pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch index 98e02a0..147951c 100644 --- a/debian/patches/pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch +++ b/debian/patches/pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch @@ -14,7 +14,7 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index d01ee5d489..6129c3ce0c 100644 +index 69afe3441b..b2e9b2aec7 100644 --- a/meson.build +++ b/meson.build @@ -1528,6 +1528,7 @@ keyutils = dependency('libkeyutils', required: false, @@ -34,7 +34,7 @@ index d01ee5d489..6129c3ce0c 100644 endif diff --git a/os-posix.c b/os-posix.c -index 5adc69f560..80c7777f10 100644 +index 90ea71725f..33745a8c22 100644 --- a/os-posix.c +++ b/os-posix.c @@ -28,6 +28,8 @@ @@ -46,7 +46,7 @@ index 5adc69f560..80c7777f10 100644 /* Needed early for CONFIG_BSD etc. */ #include "net/slirp.h" -@@ -287,9 +289,10 @@ void os_setup_post(void) +@@ -301,9 +303,10 @@ void os_setup_post(void) dup2(fd, 0); dup2(fd, 1); diff --git a/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch b/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch index a3d7386..9437869 100644 --- a/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch +++ b/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch @@ -53,7 +53,7 @@ index a7824b5266..de6a271b58 100644 softmmu_ss.add(files( 'block-dirty-bitmap.c', diff --git a/migration/migration.c b/migration/migration.c -index bda4789193..c8318aa258 100644 +index 99f86bd6c2..db229e72c9 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -245,6 +245,7 @@ void migration_object_init(void)