From adeb0c7adc9346abafa2b01d87e90b3ada54523c Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 30 Mar 2017 16:06:44 +0200 Subject: [PATCH] vma: don't use O_DIRECT on pipes --- .../pve/0001-fr-ca-keymap-corrections.patch | 2 +- ...djust-network-script-path-to-etc-kvm.patch | 2 +- .../pve/0003-vnc-altgr-emulation.patch | 2 +- ...rn-success-on-info-without-snapshots.patch | 2 +- .../patches/pve/0005-use-kvm-by-default.patch | 2 +- .../pve/0006-virtio-balloon-fix-query.patch | 2 +- ...del-to-kvm64-32-instead-of-qemu64-32.patch | 2 +- .../pve/0008-qapi-modify-query-machines.patch | 2 +- .../pve/0009-qapi-modify-spice-query.patch | 2 +- ...-to-pve-certs-unless-otherwise-speci.patch | 2 +- ...011-introduce-new-vma-archive-format.patch | 2 +- .../pve/0012-vma-add-verify-command.patch | 2 +- ...dd-config-command-to-dump-the-config.patch | 2 +- .../pve/0014-backup-modify-job-api.patch | 2 +- ...0015-backup-add-pve-monitor-commands.patch | 2 +- .../pve/0016-backup-vma-add-dir-format.patch | 2 +- ...o-not-return-errors-in-dump-callback.patch | 2 +- ...backup-vma-correctly-propagate-error.patch | 2 +- .../0019-backup-vma-remove-async-queue.patch | 2 +- ...ackup-vma-run-flush-inside-coroutine.patch | 2 +- ...021-backup-do-not-use-bdrv_drain_all.patch | 2 +- .../pve/0022-internal-snapshot-async.patch | 2 +- .../0023-backup-vma-allow-empty-backups.patch | 2 +- .../pve/0024-qmp-add-get_link_status.patch | 2 +- .../pve/0025-smm_available-false.patch | 2 +- ...space-between-VERSION-and-PKGVERSION.patch | 2 +- .../patches/pve/0027-vma-add-firewall.patch | 2 +- ...async-migration-and-bdrv_open-update.patch | 2 +- .../0029-vnc-make-x509-imply-tls-again.patch | 2 +- .../pve/0030-PVE-VNC-authentication.patch | 2 +- ...-don-t-bail-out-on-zero-length-files.patch | 2 +- ...better-driver-guessing-for-bdrv_open.patch | 2 +- ...add-the-zeroinit-block-driver-filter.patch | 2 +- ...-add-format-option-to-device-mapping.patch | 2 +- ...ix-possible-unitialised-return-value.patch | 2 +- ...036-vnc-refactor-to-QIOChannelSocket.patch | 2 +- ...0037-vma-use-BlockBackend-on-extract.patch | 2 +- .../pve/0038-vma-byte-based-write-calls.patch | 2 +- ...cache_writethrough_until_flush-with-.patch | 2 +- ...afe-for-vma-extract_content-and-qmp_.patch | 2 +- .../pve/0041-savevm-async-updates.patch | 2 +- ...42-qmp_snapshot_drive-add-aiocontext.patch | 2 +- ...-to-blk_co_preadv-should-be-bytes-no.patch | 2 +- ...rfs-no-default-logfile-if-daemonized.patch | 2 +- ...delete_drive_snapshot-add-aiocontext.patch | 2 +- ...0046-convert-savevm-async-to-threads.patch | 2 +- .../0047-glusterfs-allow-partial-reads.patch | 2 +- ...0048-vma-don-t-use-O_DIRECT-on-pipes.patch | 51 +++++++++++++++++++ debian/patches/series | 1 + 49 files changed, 99 insertions(+), 47 deletions(-) create mode 100644 debian/patches/pve/0048-vma-don-t-use-O_DIRECT-on-pipes.patch diff --git a/debian/patches/pve/0001-fr-ca-keymap-corrections.patch b/debian/patches/pve/0001-fr-ca-keymap-corrections.patch index 7f3efbf..dc72688 100644 --- a/debian/patches/pve/0001-fr-ca-keymap-corrections.patch +++ b/debian/patches/pve/0001-fr-ca-keymap-corrections.patch @@ -1,7 +1,7 @@ From 45b6688a45611bb5818e1b6aa7313c91797aa003 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:15:49 +0100 -Subject: [PATCH 01/47] fr-ca keymap corrections +Subject: [PATCH 01/48] fr-ca keymap corrections --- pc-bios/keymaps/fr-ca | 9 +++++++++ diff --git a/debian/patches/pve/0002-Adjust-network-script-path-to-etc-kvm.patch b/debian/patches/pve/0002-Adjust-network-script-path-to-etc-kvm.patch index 8c7c7af..b9e79c3 100644 --- a/debian/patches/pve/0002-Adjust-network-script-path-to-etc-kvm.patch +++ b/debian/patches/pve/0002-Adjust-network-script-path-to-etc-kvm.patch @@ -1,7 +1,7 @@ From 392fb50a1c43b47acffb1073a458703da93dfdd8 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:16:49 +0100 -Subject: [PATCH 02/47] Adjust network script path to /etc/kvm/ +Subject: [PATCH 02/48] Adjust network script path to /etc/kvm/ --- include/net/net.h | 5 +++-- diff --git a/debian/patches/pve/0003-vnc-altgr-emulation.patch b/debian/patches/pve/0003-vnc-altgr-emulation.patch index 849fa1c..d43ad39 100644 --- a/debian/patches/pve/0003-vnc-altgr-emulation.patch +++ b/debian/patches/pve/0003-vnc-altgr-emulation.patch @@ -1,7 +1,7 @@ From f3e33fe70da6f9361bd940d2b029d293a71408ca Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:17:38 +0100 -Subject: [PATCH 03/47] vnc: altgr emulation +Subject: [PATCH 03/48] vnc: altgr emulation --- ui/vnc.c | 26 +++++++++++++++++++++++++- diff --git a/debian/patches/pve/0004-qemu-img-return-success-on-info-without-snapshots.patch b/debian/patches/pve/0004-qemu-img-return-success-on-info-without-snapshots.patch index 4db31aa..77e2dce 100644 --- a/debian/patches/pve/0004-qemu-img-return-success-on-info-without-snapshots.patch +++ b/debian/patches/pve/0004-qemu-img-return-success-on-info-without-snapshots.patch @@ -1,7 +1,7 @@ From adea2808e62d32a9b22bbe3d16c84c92289983a8 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:18:46 +0100 -Subject: [PATCH 04/47] qemu-img: return success on info without snapshots +Subject: [PATCH 04/48] qemu-img: return success on info without snapshots --- qemu-img.c | 3 ++- diff --git a/debian/patches/pve/0005-use-kvm-by-default.patch b/debian/patches/pve/0005-use-kvm-by-default.patch index 318ef75..0508587 100644 --- a/debian/patches/pve/0005-use-kvm-by-default.patch +++ b/debian/patches/pve/0005-use-kvm-by-default.patch @@ -1,7 +1,7 @@ From bd3aa97864804b5b37421f199b9fe64e3b16b52c Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:27:05 +0100 -Subject: [PATCH 05/47] use kvm by default +Subject: [PATCH 05/48] use kvm by default --- accel.c | 4 ++-- diff --git a/debian/patches/pve/0006-virtio-balloon-fix-query.patch b/debian/patches/pve/0006-virtio-balloon-fix-query.patch index 16a1e7d..8a430b4 100644 --- a/debian/patches/pve/0006-virtio-balloon-fix-query.patch +++ b/debian/patches/pve/0006-virtio-balloon-fix-query.patch @@ -1,7 +1,7 @@ From 5921bc0360f6964a5bb5355c2707c806425f4734 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:27:49 +0100 -Subject: [PATCH 06/47] virtio-balloon: fix query +Subject: [PATCH 06/48] virtio-balloon: fix query Actually provide memory information via the query-balloon command. diff --git a/debian/patches/pve/0007-set-the-CPU-model-to-kvm64-32-instead-of-qemu64-32.patch b/debian/patches/pve/0007-set-the-CPU-model-to-kvm64-32-instead-of-qemu64-32.patch index 1a27c02..8bc87ce 100644 --- a/debian/patches/pve/0007-set-the-CPU-model-to-kvm64-32-instead-of-qemu64-32.patch +++ b/debian/patches/pve/0007-set-the-CPU-model-to-kvm64-32-instead-of-qemu64-32.patch @@ -1,7 +1,7 @@ From bc04d6e5e09d517a9c8833fd407a655be3cf21fe Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:30:21 +0100 -Subject: [PATCH 07/47] set the CPU model to kvm64/32 instead of qemu64/32 +Subject: [PATCH 07/48] set the CPU model to kvm64/32 instead of qemu64/32 --- hw/i386/pc.c | 4 ++-- diff --git a/debian/patches/pve/0008-qapi-modify-query-machines.patch b/debian/patches/pve/0008-qapi-modify-query-machines.patch index 1e04a69..f244794 100644 --- a/debian/patches/pve/0008-qapi-modify-query-machines.patch +++ b/debian/patches/pve/0008-qapi-modify-query-machines.patch @@ -1,7 +1,7 @@ From e453e9a98f7f0c2a213fe5bee04ece37ce10e625 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:31:18 +0100 -Subject: [PATCH 08/47] qapi: modify query machines +Subject: [PATCH 08/48] qapi: modify query machines provide '*is-current' in MachineInfo struct --- diff --git a/debian/patches/pve/0009-qapi-modify-spice-query.patch b/debian/patches/pve/0009-qapi-modify-spice-query.patch index 389a2f4..50e3306 100644 --- a/debian/patches/pve/0009-qapi-modify-spice-query.patch +++ b/debian/patches/pve/0009-qapi-modify-spice-query.patch @@ -1,7 +1,7 @@ From c51f39a5741210b7df2ac212a8ced14ef950d415 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:32:11 +0100 -Subject: [PATCH 09/47] qapi: modify spice query +Subject: [PATCH 09/48] qapi: modify spice query Provide the last ticket in the SpiceInfo struct optionally. --- diff --git a/debian/patches/pve/0010-ui-spice-default-to-pve-certs-unless-otherwise-speci.patch b/debian/patches/pve/0010-ui-spice-default-to-pve-certs-unless-otherwise-speci.patch index b91a737..1be891a 100644 --- a/debian/patches/pve/0010-ui-spice-default-to-pve-certs-unless-otherwise-speci.patch +++ b/debian/patches/pve/0010-ui-spice-default-to-pve-certs-unless-otherwise-speci.patch @@ -1,7 +1,7 @@ From 1434b9fad738e852f789cd8b951f2f4e1e08d3e5 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:33:34 +0100 -Subject: [PATCH 10/47] ui/spice: default to pve certs unless otherwise +Subject: [PATCH 10/48] ui/spice: default to pve certs unless otherwise specified --- diff --git a/debian/patches/pve/0011-introduce-new-vma-archive-format.patch b/debian/patches/pve/0011-introduce-new-vma-archive-format.patch index 92523a3..124889b 100644 --- a/debian/patches/pve/0011-introduce-new-vma-archive-format.patch +++ b/debian/patches/pve/0011-introduce-new-vma-archive-format.patch @@ -1,7 +1,7 @@ From c1338b34ccac2c5e6d7d1aca3ca3e3457a3f744c Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 13 Nov 2012 11:11:38 +0100 -Subject: [PATCH 11/47] introduce new vma archive format +Subject: [PATCH 11/48] introduce new vma archive format This is a very simple archive format, see docs/specs/vma_spec.txt diff --git a/debian/patches/pve/0012-vma-add-verify-command.patch b/debian/patches/pve/0012-vma-add-verify-command.patch index 02739bb..46234ea 100644 --- a/debian/patches/pve/0012-vma-add-verify-command.patch +++ b/debian/patches/pve/0012-vma-add-verify-command.patch @@ -1,7 +1,7 @@ From f6a9d9269a4f07eb7b2161884dde52a65f58c9f6 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 11 Mar 2013 07:07:46 +0100 -Subject: [PATCH 12/47] vma: add verify command +Subject: [PATCH 12/48] vma: add verify command Users wants to verify the archive after backup. diff --git a/debian/patches/pve/0013-vma-add-config-command-to-dump-the-config.patch b/debian/patches/pve/0013-vma-add-config-command-to-dump-the-config.patch index f8518bc..06334f0 100644 --- a/debian/patches/pve/0013-vma-add-config-command-to-dump-the-config.patch +++ b/debian/patches/pve/0013-vma-add-config-command-to-dump-the-config.patch @@ -1,7 +1,7 @@ From cfc9d20b832a3db40b4e61fa6af0fbcda911ec2e Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:46:49 +0100 -Subject: [PATCH 13/47] vma: add 'config' command to dump the config +Subject: [PATCH 13/48] vma: add 'config' command to dump the config --- vma.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/debian/patches/pve/0014-backup-modify-job-api.patch b/debian/patches/pve/0014-backup-modify-job-api.patch index 53975e6..4ec816b 100644 --- a/debian/patches/pve/0014-backup-modify-job-api.patch +++ b/debian/patches/pve/0014-backup-modify-job-api.patch @@ -1,7 +1,7 @@ From c46139b295f9edffd43a12e7f029fce4f9b2ea46 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:04:57 +0100 -Subject: [PATCH 14/47] backup: modify job api +Subject: [PATCH 14/48] backup: modify job api Introduces a BackupDump function callback and a pause_count for backup_start. For a dump-backup the target parameter diff --git a/debian/patches/pve/0015-backup-add-pve-monitor-commands.patch b/debian/patches/pve/0015-backup-add-pve-monitor-commands.patch index 874d6ce..7c00193 100644 --- a/debian/patches/pve/0015-backup-add-pve-monitor-commands.patch +++ b/debian/patches/pve/0015-backup-add-pve-monitor-commands.patch @@ -1,7 +1,7 @@ From d48092bb9901112b3356aa8d461c45ffb4ec2b9a Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:20:56 +0100 -Subject: [PATCH 15/47] backup: add pve monitor commands +Subject: [PATCH 15/48] backup: add pve monitor commands --- blockdev.c | 465 ++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/debian/patches/pve/0016-backup-vma-add-dir-format.patch b/debian/patches/pve/0016-backup-vma-add-dir-format.patch index 232e9f8..3d36d5f 100644 --- a/debian/patches/pve/0016-backup-vma-add-dir-format.patch +++ b/debian/patches/pve/0016-backup-vma-add-dir-format.patch @@ -1,7 +1,7 @@ From 99a526d92531d64ff0c31a83d0d55f38651a32a5 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:21:54 +0100 -Subject: [PATCH 16/47] backup: vma: add dir format +Subject: [PATCH 16/48] backup: vma: add dir format --- blockdev.c | 137 ++++++++++++++++++++++++++++++++++++++++--------------- diff --git a/debian/patches/pve/0017-backup-do-not-return-errors-in-dump-callback.patch b/debian/patches/pve/0017-backup-do-not-return-errors-in-dump-callback.patch index d9f44f5..031d605 100644 --- a/debian/patches/pve/0017-backup-do-not-return-errors-in-dump-callback.patch +++ b/debian/patches/pve/0017-backup-do-not-return-errors-in-dump-callback.patch @@ -1,7 +1,7 @@ From f859377de12e2faa46046b266ce4418c138e61ab Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:22:19 +0100 -Subject: [PATCH 17/47] backup: do not return errors in dump callback +Subject: [PATCH 17/48] backup: do not return errors in dump callback --- blockdev.c | 26 ++++++++++++++++++++------ diff --git a/debian/patches/pve/0018-backup-vma-correctly-propagate-error.patch b/debian/patches/pve/0018-backup-vma-correctly-propagate-error.patch index 4895eb0..437cbfa 100644 --- a/debian/patches/pve/0018-backup-vma-correctly-propagate-error.patch +++ b/debian/patches/pve/0018-backup-vma-correctly-propagate-error.patch @@ -1,7 +1,7 @@ From 17b2fc7ed399325558b891e13e104214568fd154 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:39:36 +0100 -Subject: [PATCH 18/47] backup: vma: correctly propagate error +Subject: [PATCH 18/48] backup: vma: correctly propagate error --- blockdev.c | 2 +- diff --git a/debian/patches/pve/0019-backup-vma-remove-async-queue.patch b/debian/patches/pve/0019-backup-vma-remove-async-queue.patch index 066f1b1..c691e9e 100644 --- a/debian/patches/pve/0019-backup-vma-remove-async-queue.patch +++ b/debian/patches/pve/0019-backup-vma-remove-async-queue.patch @@ -1,7 +1,7 @@ From bf0b444a62df49c016eb47f0299e5656d830234e Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:40:00 +0100 -Subject: [PATCH 19/47] backup: vma: remove async queue +Subject: [PATCH 19/48] backup: vma: remove async queue --- blockdev.c | 6 ++ diff --git a/debian/patches/pve/0020-backup-vma-run-flush-inside-coroutine.patch b/debian/patches/pve/0020-backup-vma-run-flush-inside-coroutine.patch index 7baafcc..d00f07b 100644 --- a/debian/patches/pve/0020-backup-vma-run-flush-inside-coroutine.patch +++ b/debian/patches/pve/0020-backup-vma-run-flush-inside-coroutine.patch @@ -1,7 +1,7 @@ From c0b66c21bb4d4cc1f02d4259d62dd8d6d413fd7f Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:40:42 +0100 -Subject: [PATCH 20/47] backup: vma: run flush inside coroutine +Subject: [PATCH 20/48] backup: vma: run flush inside coroutine --- blockdev.c | 10 +++++++++- diff --git a/debian/patches/pve/0021-backup-do-not-use-bdrv_drain_all.patch b/debian/patches/pve/0021-backup-do-not-use-bdrv_drain_all.patch index 2253eb1..58c7c59 100644 --- a/debian/patches/pve/0021-backup-do-not-use-bdrv_drain_all.patch +++ b/debian/patches/pve/0021-backup-do-not-use-bdrv_drain_all.patch @@ -1,7 +1,7 @@ From 4de872af5f176bbcc0d2f19b9fd30a7cefbddd9a Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:41:13 +0100 -Subject: [PATCH 21/47] backup: do not use bdrv_drain_all +Subject: [PATCH 21/48] backup: do not use bdrv_drain_all --- blockdev.c | 6 +----- diff --git a/debian/patches/pve/0022-internal-snapshot-async.patch b/debian/patches/pve/0022-internal-snapshot-async.patch index 5300e7e..f20e24e 100644 --- a/debian/patches/pve/0022-internal-snapshot-async.patch +++ b/debian/patches/pve/0022-internal-snapshot-async.patch @@ -1,7 +1,7 @@ From ab6904d8e0f3a976ade19e8b5f99270738ed6518 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 16:04:32 +0100 -Subject: [PATCH 22/47] internal snapshot async +Subject: [PATCH 22/48] internal snapshot async --- Makefile.objs | 1 + diff --git a/debian/patches/pve/0023-backup-vma-allow-empty-backups.patch b/debian/patches/pve/0023-backup-vma-allow-empty-backups.patch index 556cae5..9ca91f5 100644 --- a/debian/patches/pve/0023-backup-vma-allow-empty-backups.patch +++ b/debian/patches/pve/0023-backup-vma-allow-empty-backups.patch @@ -1,7 +1,7 @@ From b5ac1badd1810f87aae5091f44bee54e3c45e979 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 16:31:51 +0100 -Subject: [PATCH 23/47] backup: vma: allow empty backups +Subject: [PATCH 23/48] backup: vma: allow empty backups --- vma-reader.c | 29 ++++++++++++------------- diff --git a/debian/patches/pve/0024-qmp-add-get_link_status.patch b/debian/patches/pve/0024-qmp-add-get_link_status.patch index d382519..f57929f 100644 --- a/debian/patches/pve/0024-qmp-add-get_link_status.patch +++ b/debian/patches/pve/0024-qmp-add-get_link_status.patch @@ -1,7 +1,7 @@ From 759fdd7b7ea2f90a463d4bc766f9c53053498c58 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 16:34:41 +0100 -Subject: [PATCH 24/47] qmp: add get_link_status +Subject: [PATCH 24/48] qmp: add get_link_status --- net/net.c | 27 +++++++++++++++++++++++++++ diff --git a/debian/patches/pve/0025-smm_available-false.patch b/debian/patches/pve/0025-smm_available-false.patch index a71811a..34cfdc5 100644 --- a/debian/patches/pve/0025-smm_available-false.patch +++ b/debian/patches/pve/0025-smm_available-false.patch @@ -1,7 +1,7 @@ From 8a8c61f58cfde89540c885bc3b0f7e7e9d820782 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Tue, 29 Sep 2015 15:37:44 +0200 -Subject: [PATCH 25/47] smm_available = false +Subject: [PATCH 25/48] smm_available = false Signed-off-by: Alexandre Derumier --- diff --git a/debian/patches/pve/0026-use-whitespace-between-VERSION-and-PKGVERSION.patch b/debian/patches/pve/0026-use-whitespace-between-VERSION-and-PKGVERSION.patch index 43d95d5..773bd49 100644 --- a/debian/patches/pve/0026-use-whitespace-between-VERSION-and-PKGVERSION.patch +++ b/debian/patches/pve/0026-use-whitespace-between-VERSION-and-PKGVERSION.patch @@ -1,7 +1,7 @@ From 7329980dbe0b2c40a7262c4ea4946dfb23c189c6 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 16:50:05 +0100 -Subject: [PATCH 26/47] use whitespace between VERSION and PKGVERSION +Subject: [PATCH 26/48] use whitespace between VERSION and PKGVERSION Our kvm version parser expects a white space or comma after the version string, see PVE::QemuServer::kvm_user_version() diff --git a/debian/patches/pve/0027-vma-add-firewall.patch b/debian/patches/pve/0027-vma-add-firewall.patch index a3129a9..f65b173 100644 --- a/debian/patches/pve/0027-vma-add-firewall.patch +++ b/debian/patches/pve/0027-vma-add-firewall.patch @@ -1,7 +1,7 @@ From 4e55ff68ec7aef1e2ea602890495cd862dd1161c Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 16:51:23 +0100 -Subject: [PATCH 27/47] vma: add firewall +Subject: [PATCH 27/48] vma: add firewall --- blockdev.c | 78 ++++++++++++++++++++++++++++++++++---------------------- diff --git a/debian/patches/pve/0028-savevm-async-migration-and-bdrv_open-update.patch b/debian/patches/pve/0028-savevm-async-migration-and-bdrv_open-update.patch index ba977ce..0c3c864 100644 --- a/debian/patches/pve/0028-savevm-async-migration-and-bdrv_open-update.patch +++ b/debian/patches/pve/0028-savevm-async-migration-and-bdrv_open-update.patch @@ -1,7 +1,7 @@ From 54847dbb3050d9ec9dd786d572d9c1dff0757d4d Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 10 Dec 2015 15:14:00 +0100 -Subject: [PATCH 28/47] savevm-async: migration and bdrv_open update +Subject: [PATCH 28/48] savevm-async: migration and bdrv_open update --- savevm-async.c | 25 ++++++++++++------------- diff --git a/debian/patches/pve/0029-vnc-make-x509-imply-tls-again.patch b/debian/patches/pve/0029-vnc-make-x509-imply-tls-again.patch index b719a8a..81cce23 100644 --- a/debian/patches/pve/0029-vnc-make-x509-imply-tls-again.patch +++ b/debian/patches/pve/0029-vnc-make-x509-imply-tls-again.patch @@ -1,7 +1,7 @@ From 4e0a43ec969bcdf5d3bb01892bc75346e47676d6 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 12 Jan 2016 09:09:49 +0100 -Subject: [PATCH 29/47] vnc: make x509 imply tls again +Subject: [PATCH 29/48] vnc: make x509 imply tls again --- ui/vnc.c | 5 ++--- diff --git a/debian/patches/pve/0030-PVE-VNC-authentication.patch b/debian/patches/pve/0030-PVE-VNC-authentication.patch index 86d2bab..681fc4a 100644 --- a/debian/patches/pve/0030-PVE-VNC-authentication.patch +++ b/debian/patches/pve/0030-PVE-VNC-authentication.patch @@ -1,7 +1,7 @@ From d55b3d4bca482ded41c0c1489626e426007e786c Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 11 Jan 2016 10:40:31 +0100 -Subject: [PATCH 30/47] PVE VNC authentication +Subject: [PATCH 30/48] PVE VNC authentication --- crypto/tlscreds.c | 47 +++++++++++ diff --git a/debian/patches/pve/0031-vma-writer-don-t-bail-out-on-zero-length-files.patch b/debian/patches/pve/0031-vma-writer-don-t-bail-out-on-zero-length-files.patch index f6e57cd..f470528 100644 --- a/debian/patches/pve/0031-vma-writer-don-t-bail-out-on-zero-length-files.patch +++ b/debian/patches/pve/0031-vma-writer-don-t-bail-out-on-zero-length-files.patch @@ -1,7 +1,7 @@ From c1210916b52651aaa5d27e69fce78dd57818eab1 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 8 Feb 2016 08:23:34 +0100 -Subject: [PATCH 31/47] vma-writer: don't bail out on zero-length files +Subject: [PATCH 31/48] vma-writer: don't bail out on zero-length files --- vma-writer.c | 1 - diff --git a/debian/patches/pve/0032-vma-better-driver-guessing-for-bdrv_open.patch b/debian/patches/pve/0032-vma-better-driver-guessing-for-bdrv_open.patch index f6cbaad..2a2614b 100644 --- a/debian/patches/pve/0032-vma-better-driver-guessing-for-bdrv_open.patch +++ b/debian/patches/pve/0032-vma-better-driver-guessing-for-bdrv_open.patch @@ -1,7 +1,7 @@ From 0cf02f586f50e0bc1b25f0ecf76207b2510d77df Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 23 Feb 2016 15:48:41 +0100 -Subject: [PATCH 32/47] vma: better driver guessing for bdrv_open +Subject: [PATCH 32/48] vma: better driver guessing for bdrv_open Only use 'raw' when the file actually ends with .raw and no protocol has been specified. With protocol pass the diff --git a/debian/patches/pve/0033-block-add-the-zeroinit-block-driver-filter.patch b/debian/patches/pve/0033-block-add-the-zeroinit-block-driver-filter.patch index 370c8a9..d4be32d 100644 --- a/debian/patches/pve/0033-block-add-the-zeroinit-block-driver-filter.patch +++ b/debian/patches/pve/0033-block-add-the-zeroinit-block-driver-filter.patch @@ -1,7 +1,7 @@ From 35facc3a3549baf4cccaef27afa9c35a25abe91c Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 17 Mar 2016 11:33:37 +0100 -Subject: [PATCH 33/47] block: add the zeroinit block driver filter +Subject: [PATCH 33/48] block: add the zeroinit block driver filter --- block/Makefile.objs | 1 + diff --git a/debian/patches/pve/0034-vma-add-format-option-to-device-mapping.patch b/debian/patches/pve/0034-vma-add-format-option-to-device-mapping.patch index 1e3b5ee..4a26623 100644 --- a/debian/patches/pve/0034-vma-add-format-option-to-device-mapping.patch +++ b/debian/patches/pve/0034-vma-add-format-option-to-device-mapping.patch @@ -1,7 +1,7 @@ From a61194439318c95dfcb7df973ac961c12937dbcd Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 12 Apr 2016 13:49:44 +0200 -Subject: [PATCH 34/47] vma: add format option to device mapping +Subject: [PATCH 34/48] vma: add format option to device mapping The BDRV_O_PROTOCOL option breaks non-raw protocol devices, so we instead now allow the format to be explicitly diff --git a/debian/patches/pve/0035-fix-possible-unitialised-return-value.patch b/debian/patches/pve/0035-fix-possible-unitialised-return-value.patch index 1e39eab..c9af179 100644 --- a/debian/patches/pve/0035-fix-possible-unitialised-return-value.patch +++ b/debian/patches/pve/0035-fix-possible-unitialised-return-value.patch @@ -1,7 +1,7 @@ From 6db418de8e775dd2f3699033699777498f4e2afd Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 6 Apr 2016 16:45:15 +0200 -Subject: [PATCH 35/47] fix possible unitialised return value +Subject: [PATCH 35/48] fix possible unitialised return value --- migration/savevm.c | 2 +- diff --git a/debian/patches/pve/0036-vnc-refactor-to-QIOChannelSocket.patch b/debian/patches/pve/0036-vnc-refactor-to-QIOChannelSocket.patch index f6d3223..3e3e988 100644 --- a/debian/patches/pve/0036-vnc-refactor-to-QIOChannelSocket.patch +++ b/debian/patches/pve/0036-vnc-refactor-to-QIOChannelSocket.patch @@ -1,7 +1,7 @@ From f9fec937bcc33ff1edb11b53107486a35b23f2a8 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 6 Apr 2016 16:47:54 +0200 -Subject: [PATCH 36/47] vnc: refactor to QIOChannelSocket +Subject: [PATCH 36/48] vnc: refactor to QIOChannelSocket --- ui/vnc-auth-vencrypt.c | 31 ++++++++++++++++--------------- diff --git a/debian/patches/pve/0037-vma-use-BlockBackend-on-extract.patch b/debian/patches/pve/0037-vma-use-BlockBackend-on-extract.patch index c0a5610..0089256 100644 --- a/debian/patches/pve/0037-vma-use-BlockBackend-on-extract.patch +++ b/debian/patches/pve/0037-vma-use-BlockBackend-on-extract.patch @@ -1,7 +1,7 @@ From d63b3c58bce32b976231923f5e186ebd55259c98 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 1 Jul 2016 15:47:29 +0200 -Subject: [PATCH 37/47] vma: use BlockBackend on extract +Subject: [PATCH 37/48] vma: use BlockBackend on extract As we else rely on bdrv_close_all() do clean up, which was rewritten in ca9bd24cf1d53775169ba9adc17e265554d1afed and fails on "dangling" diff --git a/debian/patches/pve/0038-vma-byte-based-write-calls.patch b/debian/patches/pve/0038-vma-byte-based-write-calls.patch index 3e99dcd..6727f09 100644 --- a/debian/patches/pve/0038-vma-byte-based-write-calls.patch +++ b/debian/patches/pve/0038-vma-byte-based-write-calls.patch @@ -1,7 +1,7 @@ From a004ee9295029201e8fc3b8fe4acf7f85674527c Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 9 Sep 2016 14:51:28 +0200 -Subject: [PATCH 38/47] vma: byte based write calls +Subject: [PATCH 38/48] vma: byte based write calls --- vma-reader.c | 42 +++++++++++++++++++++--------------------- diff --git a/debian/patches/pve/0039-rbd-disable-rbd_cache_writethrough_until_flush-with-.patch b/debian/patches/pve/0039-rbd-disable-rbd_cache_writethrough_until_flush-with-.patch index 6709196..0f1a65e 100644 --- a/debian/patches/pve/0039-rbd-disable-rbd_cache_writethrough_until_flush-with-.patch +++ b/debian/patches/pve/0039-rbd-disable-rbd_cache_writethrough_until_flush-with-.patch @@ -1,7 +1,7 @@ From 0dd047c39e7821c8e31f9133be12bc9be61c045c Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Tue, 26 Jul 2016 16:51:00 +0200 -Subject: [PATCH 39/47] rbd: disable rbd_cache_writethrough_until_flush with +Subject: [PATCH 39/48] rbd: disable rbd_cache_writethrough_until_flush with cache=unsafe Signed-off-by: Alexandre Derumier diff --git a/debian/patches/pve/0040-enable-cache-unsafe-for-vma-extract_content-and-qmp_.patch b/debian/patches/pve/0040-enable-cache-unsafe-for-vma-extract_content-and-qmp_.patch index e0f1264..9b42f49 100644 --- a/debian/patches/pve/0040-enable-cache-unsafe-for-vma-extract_content-and-qmp_.patch +++ b/debian/patches/pve/0040-enable-cache-unsafe-for-vma-extract_content-and-qmp_.patch @@ -1,7 +1,7 @@ From 5a587bc1cfc30faa8506b5c2925b767b4c3d7b56 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 1 Aug 2016 10:52:46 +0200 -Subject: [PATCH 40/47] enable cache=unsafe for vma extract_content and +Subject: [PATCH 40/48] enable cache=unsafe for vma extract_content and qmp_savevm_start We don't send any flush here, so we need to open with cache=unsafe. diff --git a/debian/patches/pve/0041-savevm-async-updates.patch b/debian/patches/pve/0041-savevm-async-updates.patch index 350337d..781ddb4 100644 --- a/debian/patches/pve/0041-savevm-async-updates.patch +++ b/debian/patches/pve/0041-savevm-async-updates.patch @@ -1,7 +1,7 @@ From d7b0ad8cf8ef0aad35b0549128003dbb49b8386d Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 9 Sep 2016 15:21:19 +0200 -Subject: [PATCH 41/47] savevm-async updates +Subject: [PATCH 41/48] savevm-async updates --- savevm-async.c | 79 +++++++++++++++++++++++++++++----------------------------- diff --git a/debian/patches/pve/0042-qmp_snapshot_drive-add-aiocontext.patch b/debian/patches/pve/0042-qmp_snapshot_drive-add-aiocontext.patch index 59f359e..10ae052 100644 --- a/debian/patches/pve/0042-qmp_snapshot_drive-add-aiocontext.patch +++ b/debian/patches/pve/0042-qmp_snapshot_drive-add-aiocontext.patch @@ -1,7 +1,7 @@ From 4fb6191acb1fdff8170a26ba9acd835c9eaf8218 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Tue, 13 Sep 2016 01:57:56 +0200 -Subject: [PATCH 42/47] qmp_snapshot_drive: add aiocontext +Subject: [PATCH 42/48] qmp_snapshot_drive: add aiocontext Signed-off-by: Alexandre Derumier --- diff --git a/debian/patches/pve/0043-vma-sizes-passed-to-blk_co_preadv-should-be-bytes-no.patch b/debian/patches/pve/0043-vma-sizes-passed-to-blk_co_preadv-should-be-bytes-no.patch index 1a6bc90..97ebf96 100644 --- a/debian/patches/pve/0043-vma-sizes-passed-to-blk_co_preadv-should-be-bytes-no.patch +++ b/debian/patches/pve/0043-vma-sizes-passed-to-blk_co_preadv-should-be-bytes-no.patch @@ -1,7 +1,7 @@ From 220fb93343dc6c05989c903873d8ed68943848ef Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 21 Oct 2016 09:09:26 +0200 -Subject: [PATCH 43/47] vma: sizes passed to blk_co_preadv should be bytes now +Subject: [PATCH 43/48] vma: sizes passed to blk_co_preadv should be bytes now --- vma.c | 4 ++-- diff --git a/debian/patches/pve/0044-glusterfs-no-default-logfile-if-daemonized.patch b/debian/patches/pve/0044-glusterfs-no-default-logfile-if-daemonized.patch index 107640b..4b5694d 100644 --- a/debian/patches/pve/0044-glusterfs-no-default-logfile-if-daemonized.patch +++ b/debian/patches/pve/0044-glusterfs-no-default-logfile-if-daemonized.patch @@ -1,7 +1,7 @@ From cb89d816594f141bad45536886900cbf33ba09bd Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 24 Oct 2016 09:32:36 +0200 -Subject: [PATCH 44/47] glusterfs: no default logfile if daemonized +Subject: [PATCH 44/48] glusterfs: no default logfile if daemonized --- block/gluster.c | 15 +++++++++++---- diff --git a/debian/patches/pve/0045-qmp_delete_drive_snapshot-add-aiocontext.patch b/debian/patches/pve/0045-qmp_delete_drive_snapshot-add-aiocontext.patch index 6882f83..8928886 100644 --- a/debian/patches/pve/0045-qmp_delete_drive_snapshot-add-aiocontext.patch +++ b/debian/patches/pve/0045-qmp_delete_drive_snapshot-add-aiocontext.patch @@ -1,7 +1,7 @@ From 58d620cb1d511be7a6521e76a6cd54ebbbbae2b7 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Mon, 7 Nov 2016 11:47:50 +0100 -Subject: [PATCH 45/47] qmp_delete_drive_snapshot : add aiocontext +Subject: [PATCH 45/48] qmp_delete_drive_snapshot : add aiocontext this fix snapshot delete of qcow2 with iothread enabled diff --git a/debian/patches/pve/0046-convert-savevm-async-to-threads.patch b/debian/patches/pve/0046-convert-savevm-async-to-threads.patch index e216979..d2606bc 100644 --- a/debian/patches/pve/0046-convert-savevm-async-to-threads.patch +++ b/debian/patches/pve/0046-convert-savevm-async-to-threads.patch @@ -1,7 +1,7 @@ From 190e9321e1657ec0b956ecece21d6a037487cd14 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 8 Nov 2016 11:13:06 +0100 -Subject: [PATCH 46/47] convert savevm-async to threads +Subject: [PATCH 46/48] convert savevm-async to threads --- savevm-async.c | 144 +++++++++++++++++++++++++++++++++++---------------------- diff --git a/debian/patches/pve/0047-glusterfs-allow-partial-reads.patch b/debian/patches/pve/0047-glusterfs-allow-partial-reads.patch index 8dbebc5..3416bc4 100644 --- a/debian/patches/pve/0047-glusterfs-allow-partial-reads.patch +++ b/debian/patches/pve/0047-glusterfs-allow-partial-reads.patch @@ -1,7 +1,7 @@ From 2cebda37c624832599906df01f540fdc76ecac50 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 30 Nov 2016 10:27:47 +0100 -Subject: [PATCH 47/47] glusterfs: allow partial reads +Subject: [PATCH 47/48] glusterfs: allow partial reads This should deal with qemu bug #1644754 until upstream decides which way to go. The general direction seems to be diff --git a/debian/patches/pve/0048-vma-don-t-use-O_DIRECT-on-pipes.patch b/debian/patches/pve/0048-vma-don-t-use-O_DIRECT-on-pipes.patch new file mode 100644 index 0000000..8ec4b1c --- /dev/null +++ b/debian/patches/pve/0048-vma-don-t-use-O_DIRECT-on-pipes.patch @@ -0,0 +1,51 @@ +From 40846f73aea36b4ef66cce152321208f7d820222 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bumiller +Date: Thu, 30 Mar 2017 16:05:34 +0200 +Subject: [PATCH 48/48] vma: don't use O_DIRECT on pipes + +It puts them in packet mode which potentially discards data. +--- + vma-writer.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/vma-writer.c b/vma-writer.c +index 70dcca0..9001cbd 100644 +--- a/vma-writer.c ++++ b/vma-writer.c +@@ -283,9 +283,8 @@ VmaWriter *vma_writer_create(const char *filename, uuid_t uuid, Error **errp) + } + vmaw->fd = fileno(vmaw->cmd); + +- /* try to use O_NONBLOCK and O_DIRECT */ ++ /* try to use O_NONBLOCK */ + fcntl(vmaw->fd, F_SETFL, fcntl(vmaw->fd, F_GETFL)|O_NONBLOCK); +- fcntl(vmaw->fd, F_SETFL, fcntl(vmaw->fd, F_GETFL)|O_DIRECT); + + } else { + struct stat st; +@@ -293,19 +292,18 @@ VmaWriter *vma_writer_create(const char *filename, uuid_t uuid, Error **errp) + const char *tmp_id_str; + + if ((stat(filename, &st) == 0) && S_ISFIFO(st.st_mode)) { +- oflags = O_NONBLOCK|O_DIRECT|O_WRONLY; ++ oflags = O_NONBLOCK|O_WRONLY; + vmaw->fd = qemu_open(filename, oflags, 0644); + } else if (strstart(filename, "/dev/fdset/", &tmp_id_str)) { +- oflags = O_NONBLOCK|O_DIRECT|O_WRONLY; ++ oflags = O_NONBLOCK|O_WRONLY; + vmaw->fd = qemu_open(filename, oflags, 0644); + } else if (strstart(filename, "/dev/fdname/", &tmp_id_str)) { + vmaw->fd = monitor_get_fd(cur_mon, tmp_id_str, errp); + if (vmaw->fd < 0) { + goto err; + } +- /* try to use O_NONBLOCK and O_DIRECT */ ++ /* try to use O_NONBLOCK */ + fcntl(vmaw->fd, F_SETFL, fcntl(vmaw->fd, F_GETFL)|O_NONBLOCK); +- fcntl(vmaw->fd, F_SETFL, fcntl(vmaw->fd, F_GETFL)|O_DIRECT); + } else { + oflags = O_NONBLOCK|O_DIRECT|O_WRONLY|O_CREAT|O_EXCL; + vmaw->fd = qemu_open(filename, oflags, 0644); +-- +2.1.4 + diff --git a/debian/patches/series b/debian/patches/series index 01458f3..6a01378 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -45,3 +45,4 @@ pve/0044-glusterfs-no-default-logfile-if-daemonized.patch pve/0045-qmp_delete_drive_snapshot-add-aiocontext.patch pve/0046-convert-savevm-async-to-threads.patch pve/0047-glusterfs-allow-partial-reads.patch +pve/0048-vma-don-t-use-O_DIRECT-on-pipes.patch -- 2.39.2