From c36e3f9d1710aad410ff85f101347abe69a3d2ff Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Mon, 14 Aug 2023 10:52:25 +0200 Subject: [PATCH] refresh patch context Signed-off-by: Fiona Ebner Acked-by: Wolfgang Bumiller --- ...-PVE-add-savevm-async-for-background-state-snapshots.patch | 2 +- .../pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch | 2 +- .../pve/0027-PVE-Backup-add-vma-backup-format-code.patch | 4 ++-- .../pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch | 2 +- 4 files changed, 5 insertions(+), 5 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 762ba9b..0c98142 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 @@ -139,7 +139,7 @@ index 8a142fc7a9..a7824b5266 100644 'threadinfo.c', diff --git a/migration/savevm-async.c b/migration/savevm-async.c new file mode 100644 -index 0000000000..ac1fac6378 +index 0000000000..aa2017d496 --- /dev/null +++ b/migration/savevm-async.c @@ -0,0 +1,533 @@ diff --git a/debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch b/debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch index 98cd3ce..f5f6f7b 100644 --- a/debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch +++ b/debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch @@ -192,7 +192,7 @@ index 9d0155a2a1..cc06240e8d 100644 int qemu_fclose(QEMUFile *f); diff --git a/migration/savevm-async.c b/migration/savevm-async.c -index ac1fac6378..ea3b2f36a6 100644 +index aa2017d496..b97f2c4f14 100644 --- a/migration/savevm-async.c +++ b/migration/savevm-async.c @@ -380,7 +380,7 @@ void qmp_savevm_start(const char *statefile, Error **errp) 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 3c3ac54..5ee84e1 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 @@ -1735,7 +1735,7 @@ index 0000000000..ac7da237d0 +} diff --git a/vma.c b/vma.c new file mode 100644 -index 0000000000..304f02bc84 +index 0000000000..c76ecefa0f --- /dev/null +++ b/vma.c @@ -0,0 +1,878 @@ @@ -2619,7 +2619,7 @@ index 0000000000..304f02bc84 +} diff --git a/vma.h b/vma.h new file mode 100644 -index 0000000000..1b62859165 +index 0000000000..86d2873aa5 --- /dev/null +++ b/vma.h @@ -0,0 +1,150 @@ diff --git a/debian/patches/pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch b/debian/patches/pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch index 4a1b1b8..f5fa200 100644 --- a/debian/patches/pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch +++ b/debian/patches/pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch @@ -13,7 +13,7 @@ Signed-off-by: Fiona Ebner 1 file changed, 2 deletions(-) diff --git a/migration/savevm-async.c b/migration/savevm-async.c -index ea3b2f36a6..dd7744ab66 100644 +index b97f2c4f14..87ea0573d3 100644 --- a/migration/savevm-async.c +++ b/migration/savevm-async.c @@ -403,10 +403,8 @@ void qmp_savevm_start(const char *statefile, Error **errp)