From 076b402685a8ae933c4bf32ac8c48d3c5a66b040 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 19 Apr 2017 12:11:00 +0200 Subject: [PATCH] update to 2.9.0-rc5 --- Makefile | 2 +- debian/changelog | 6 + ...ermissions-during-incoming-migration.patch | 196 ------------------ .../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 | 4 +- ...0015-backup-add-pve-monitor-commands.patch | 6 +- .../pve/0016-backup-vma-add-dir-format.patch | 4 +- ...o-not-return-errors-in-dump-callback.patch | 4 +- ...backup-vma-correctly-propagate-error.patch | 4 +- .../0019-backup-vma-remove-async-queue.patch | 4 +- ...ackup-vma-run-flush-inside-coroutine.patch | 4 +- ...021-backup-do-not-use-bdrv_drain_all.patch | 4 +- .../pve/0022-internal-snapshot-async.patch | 8 +- .../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 | 4 +- ...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 | 2 +- ...k-zeroinit-request-child-permissions.patch | 2 +- debian/patches/series | 1 - qemu | 2 +- 54 files changed, 70 insertions(+), 261 deletions(-) delete mode 100644 debian/patches/extra/0001-block-ignore-guest-dev-permissions-during-incoming-migration.patch diff --git a/Makefile b/Makefile index 6a43807..69fa3ff 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # also update debian/changelog KVMVER=2.9.0 -KVMPKGREL=1~rc3 +KVMPKGREL=1~rc5 KVMPACKAGE = pve-qemu-kvm KVMSRC = qemu diff --git a/debian/changelog b/debian/changelog index 6406753..8f66363 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pve-qemu-kvm (2.9.0-1~rc5) unstable; urgency=medium + + * update to 2.9.0-rc5 + + -- Proxmox Support Team Wed, 19 Apr 2017 12:10:47 +0200 + pve-qemu-kvm (2.9.0-1~rc3) unstable; urgency=medium * update to 2.9.0-rc3 diff --git a/debian/patches/extra/0001-block-ignore-guest-dev-permissions-during-incoming-migration.patch b/debian/patches/extra/0001-block-ignore-guest-dev-permissions-during-incoming-migration.patch deleted file mode 100644 index 6dac21e..0000000 --- a/debian/patches/extra/0001-block-ignore-guest-dev-permissions-during-incoming-migration.patch +++ /dev/null @@ -1,196 +0,0 @@ -From qemu-devel-bounces+w.bumiller=proxmox.com@nongnu.org Wed Apr 5 08:57:05 2017 -Return-Path: -Received: from ronja.mits.lan (localhost [127.0.0.1]) by ronja (Cyrus v2.4.16-Debian-2.4.16-4.32.201410011447) with LMTPA; Tue, 04 Apr 2017 17:40:54 +0200 -X-Sieve: CMU Sieve 2.4 -Received: from proxmox.maurer-it.com (mail.proxmox.com [192.168.2.110]) by ronja.mits.lan (Postfix) with ESMTPS id 666CAF61213 for ; Tue, 4 Apr 2017 17:40:54 +0200 (CEST) -Received: from proxmox.maurer-it.com (localhost [127.0.0.1]) by proxmox.maurer-it.com (Proxmox) with ESMTP id 9655510C7994 for ; Tue, 4 Apr 2017 17:40:54 +0200 (CEST) -Received-SPF: pass (nongnu.org ... gnu.org: 208.118.235.17 is authorized to use 'qemu-devel-bounces@nongnu.org' in 'mfrom' identity (mechanism 'ip4:208.118.235.0/24' matched)) receiver=proxmox.maurer-it.com; identity=mailfrom; envelope-from="qemu-devel-bounces@nongnu.org"; helo=lists.gnu.org; client-ip=208.118.235.17 -Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by proxmox.maurer-it.com (Proxmox) with ESMTPS id DDC8A110E4A3 for ; Tue, 4 Apr 2017 17:40:51 +0200 (CEST) -Received: from localhost ([::1]:36303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvQZd-0001pP-Un for w.bumiller@proxmox.com; Tue, 04 Apr 2017 11:40:50 -0400 -Received: from eggs.gnu.org ([2001:4830:134:3::10]:50974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvQVK-0006YZ-Kd for qemu-devel@nongnu.org; Tue, 04 Apr 2017 11:36:24 -0400 -Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvQVI-0007lq-5E for qemu-devel@nongnu.org; Tue, 04 Apr 2017 11:36:22 -0400 -Received: from mx1.redhat.com ([209.132.183.28]:39314) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cvQVC-0007bj-0p; Tue, 04 Apr 2017 11:36:14 -0400 -Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CDFA6C05678E; Tue, 4 Apr 2017 15:36:12 +0000 (UTC) -DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CDFA6C05678E -Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com -Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kwolf@redhat.com -DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com CDFA6C05678E -Received: from noname.str.redhat.com (dhcp-192-175.str.redhat.com [10.33.192.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EEA19F34F; Tue, 4 Apr 2017 15:36:01 +0000 (UTC) -From: Kevin Wolf -To: qemu-block@nongnu.org -Date: Tue, 4 Apr 2017 17:35:56 +0200 -Message-Id: <1491320156-4629-1-git-send-email-kwolf@redhat.com> -X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 -X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 04 Apr 2017 15:36:13 +0000 (UTC) -X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] -X-Received-From: 209.132.183.28 -Subject: [Qemu-devel] [RFC PATCH for-2.9] block: Ignore guest dev permissions during incoming migration -X-BeenThere: qemu-devel@nongnu.org -X-Mailman-Version: 2.1.21 -Precedence: list -List-Id: -List-Unsubscribe: , -List-Archive: -List-Post: -List-Help: -List-Subscribe: , -Cc: kwolf@redhat.com, armband@enea.com, jcody@redhat.com, Ciprian.Barbu@enea.com, qemu-devel@nongnu.org, mreitz@redhat.com, Alexandru.Avadanii@enea.com, pbonzini@redhat.com -Errors-To: qemu-devel-bounces+w.bumiller=proxmox.com@nongnu.org -Sender: "Qemu-devel" -X-Proxmox-CTCH-Refid: str=0001.0A0C0201.58E3BE85.00B9:SCFSTAT37688011,ss=1,re=-4.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 -x-proxmoxspam-level: Spam detection results: 0 AWL 0.002 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.001 From and EnvelopeFrom 2nd level mail domains are different RCVD_IN_DNSWL_HI -5 Sender listed at http://www.dnswl.org/, high trust RCVD_IN_MSPIKE_H3 -0.01 Good reputation (+3) RCVD_IN_MSPIKE_WL -0.01 Mailspike good senders SPF_PASS -0.001 SPF: sender matches SPF record -X-TUID: mR1+KkAcSCza - -Usually guest devices don't like other writers to the same image, so -they use blk_set_perm() to prevent this from happening. In the migration -phase before the VM is actually running, though, they don't have a -problem with writes to the image. On the other hand, storage migration -needs to be able to write to the image in this phase, so the restrictive -blk_set_perm() call of qdev devices breaks it. - -This patch flags all BlockBackends with a qdev device as -blk->disable_perm during incoming migration, which means that the -requested permissions are stored in the BlockBackend, but not actually -applied to its root node yet. - -Once migration has finished and the VM should be resumed, the -permissions are applied. If they cannot be applied (e.g. because the NBD -server used for block migration hasn't been shut down), resuming the VM -fails. - -Signed-off-by: Kevin Wolf ---- - block/block-backend.c | 40 +++++++++++++++++++++++++++++++++++++++- - include/block/block.h | 2 ++ - migration/migration.c | 8 ++++++++ - qmp.c | 6 ++++++ - 4 files changed, 55 insertions(+), 1 deletion(-) - -diff --git a/block/block-backend.c b/block/block-backend.c -index 0b63773..f817040 100644 ---- a/block/block-backend.c -+++ b/block/block-backend.c -@@ -61,6 +61,7 @@ struct BlockBackend { - - uint64_t perm; - uint64_t shared_perm; -+ bool disable_perm; - - bool allow_write_beyond_eof; - -@@ -578,7 +579,7 @@ int blk_set_perm(BlockBackend *blk, uint64_t perm, uint64_t shared_perm, - { - int ret; - -- if (blk->root) { -+ if (blk->root && !blk->disable_perm) { - ret = bdrv_child_try_set_perm(blk->root, perm, shared_perm, errp); - if (ret < 0) { - return ret; -@@ -597,15 +598,52 @@ void blk_get_perm(BlockBackend *blk, uint64_t *perm, uint64_t *shared_perm) - *shared_perm = blk->shared_perm; - } - -+/* -+ * Notifies the user of all BlockBackends that migration has completed. qdev -+ * devices can tighten their permissions in response (specifically revoke -+ * shared write permissions that we needed for storage migration). -+ * -+ * If an error is returned, the VM cannot be allowed to be resumed. -+ */ -+void blk_resume_after_migration(Error **errp) -+{ -+ BlockBackend *blk; -+ Error *local_err = NULL; -+ -+ for (blk = blk_next(NULL); blk; blk = blk_next(blk)) { -+ if (!blk->disable_perm) { -+ continue; -+ } -+ -+ blk->disable_perm = false; -+ -+ blk_set_perm(blk, blk->perm, blk->shared_perm, &local_err); -+ if (local_err) { -+ error_propagate(errp, local_err); -+ blk->disable_perm = true; -+ return; -+ } -+ } -+} -+ - static int blk_do_attach_dev(BlockBackend *blk, void *dev) - { - if (blk->dev) { - return -EBUSY; - } -+ -+ /* While migration is still incoming, we don't need to apply the -+ * permissions of guest device BlockBackends. We might still have a block -+ * job or NBD server writing to the image for storage migration. */ -+ if (runstate_check(RUN_STATE_INMIGRATE)) { -+ blk->disable_perm = true; -+ } -+ - blk_ref(blk); - blk->dev = dev; - blk->legacy_dev = false; - blk_iostatus_reset(blk); -+ - return 0; - } - -diff --git a/include/block/block.h b/include/block/block.h -index 5149260..3e09222 100644 ---- a/include/block/block.h -+++ b/include/block/block.h -@@ -366,6 +366,8 @@ void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp); - void bdrv_invalidate_cache_all(Error **errp); - int bdrv_inactivate_all(void); - -+void blk_resume_after_migration(Error **errp); -+ - /* Ensure contents are flushed to disk. */ - int bdrv_flush(BlockDriverState *bs); - int coroutine_fn bdrv_co_flush(BlockDriverState *bs); -diff --git a/migration/migration.c b/migration/migration.c -index 54060f7..ad4036f 100644 ---- a/migration/migration.c -+++ b/migration/migration.c -@@ -349,6 +349,14 @@ static void process_incoming_migration_bh(void *opaque) - exit(EXIT_FAILURE); - } - -+ /* If we get an error here, just don't restart the VM yet. */ -+ blk_resume_after_migration(&local_err); -+ if (local_err) { -+ error_free(local_err); -+ local_err = NULL; -+ autostart = false; -+ } -+ - /* - * This must happen after all error conditions are dealt with and - * we're sure the VM is going to be running on this host. -diff --git a/qmp.c b/qmp.c -index fa82b59..a744e44 100644 ---- a/qmp.c -+++ b/qmp.c -@@ -207,6 +207,12 @@ void qmp_cont(Error **errp) - } - } - -+ blk_resume_after_migration(&local_err); -+ if (local_err) { -+ error_propagate(errp, local_err); -+ return; -+ } -+ - if (runstate_check(RUN_STATE_INMIGRATE)) { - autostart = 1; - } else { --- -1.8.3.1 - - - diff --git a/debian/patches/pve/0001-fr-ca-keymap-corrections.patch b/debian/patches/pve/0001-fr-ca-keymap-corrections.patch index 7bf8afd..23e41e2 100644 --- a/debian/patches/pve/0001-fr-ca-keymap-corrections.patch +++ b/debian/patches/pve/0001-fr-ca-keymap-corrections.patch @@ -1,4 +1,4 @@ -From 31ccb49bbea094f80dfbcbc664dfcf2b8060231d Mon Sep 17 00:00:00 2001 +From 97e680d03a36e81be1bc0bb9878fb2da7278ddf3 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:15:49 +0100 Subject: [PATCH 01/49] fr-ca keymap corrections 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 fbb22f6..8588e53 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,4 +1,4 @@ -From 7e59abba53119cd5b842b8be922a18c8dc73d1cc Mon Sep 17 00:00:00 2001 +From 4c58dcde1e15f21d82134edc61169111831fd75f Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:16:49 +0100 Subject: [PATCH 02/49] Adjust network script path to /etc/kvm/ diff --git a/debian/patches/pve/0003-vnc-altgr-emulation.patch b/debian/patches/pve/0003-vnc-altgr-emulation.patch index adce954..1e4de51 100644 --- a/debian/patches/pve/0003-vnc-altgr-emulation.patch +++ b/debian/patches/pve/0003-vnc-altgr-emulation.patch @@ -1,4 +1,4 @@ -From 0e487cf7a98f230b99f8ffa349e22be23478aa5c Mon Sep 17 00:00:00 2001 +From 327d654584b593018eac0e983ff2005d179e3dc3 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:17:38 +0100 Subject: [PATCH 03/49] vnc: altgr emulation 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 584a4a5..74882f7 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,4 +1,4 @@ -From 0cc4bc86d6a81121a53b1dc691e62c3d47d0aa88 Mon Sep 17 00:00:00 2001 +From e91d190182eee12a93c6165aec1b8fc04b1c3eb3 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:18:46 +0100 Subject: [PATCH 04/49] qemu-img: return success on info without snapshots diff --git a/debian/patches/pve/0005-use-kvm-by-default.patch b/debian/patches/pve/0005-use-kvm-by-default.patch index 2dc547a..e0e34c6 100644 --- a/debian/patches/pve/0005-use-kvm-by-default.patch +++ b/debian/patches/pve/0005-use-kvm-by-default.patch @@ -1,4 +1,4 @@ -From 72c5264d057a0605448bc9e1b20ee2f94022e7fc Mon Sep 17 00:00:00 2001 +From 17b5f31fd4a416bad199a60a851a9fb4a2049a10 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:27:05 +0100 Subject: [PATCH 05/49] use kvm by default diff --git a/debian/patches/pve/0006-virtio-balloon-fix-query.patch b/debian/patches/pve/0006-virtio-balloon-fix-query.patch index 4348e44..1157c08 100644 --- a/debian/patches/pve/0006-virtio-balloon-fix-query.patch +++ b/debian/patches/pve/0006-virtio-balloon-fix-query.patch @@ -1,4 +1,4 @@ -From 7f13e74387d932b773fd6bcd33c1a5be99a3d89c Mon Sep 17 00:00:00 2001 +From fefc7e4fe5e6b58685f5b50ff8e31a69423a94d6 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:27:49 +0100 Subject: [PATCH 06/49] virtio-balloon: fix query 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 1994509..f259ad0 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,4 +1,4 @@ -From 4e5f2bdc825f1201c8b701d5c20939f9743db0ea Mon Sep 17 00:00:00 2001 +From 9bb5bfdac053a5f12ef8a4fd0cfd78bca604409a Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:30:21 +0100 Subject: [PATCH 07/49] set the CPU model to kvm64/32 instead of qemu64/32 diff --git a/debian/patches/pve/0008-qapi-modify-query-machines.patch b/debian/patches/pve/0008-qapi-modify-query-machines.patch index d88f904..e00f1c6 100644 --- a/debian/patches/pve/0008-qapi-modify-query-machines.patch +++ b/debian/patches/pve/0008-qapi-modify-query-machines.patch @@ -1,4 +1,4 @@ -From c9a0fe8f730979dccf506fd3563896b84ec54299 Mon Sep 17 00:00:00 2001 +From b85b4ca262e64cdaf4bc9970a211f6ce5727bd9a Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:31:18 +0100 Subject: [PATCH 08/49] qapi: modify query machines diff --git a/debian/patches/pve/0009-qapi-modify-spice-query.patch b/debian/patches/pve/0009-qapi-modify-spice-query.patch index 017a6d9..fed3f58 100644 --- a/debian/patches/pve/0009-qapi-modify-spice-query.patch +++ b/debian/patches/pve/0009-qapi-modify-spice-query.patch @@ -1,4 +1,4 @@ -From 275d91b95acd8518560087dbdc641df5679519e2 Mon Sep 17 00:00:00 2001 +From 187f37955a177dd4c5c7482a54246c9873e43acb Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:32:11 +0100 Subject: [PATCH 09/49] qapi: modify spice query 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 3b20d72..956d3d8 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,4 +1,4 @@ -From eabdbcd58c6e21cc19a6edbd7122b660d3f0263b Mon Sep 17 00:00:00 2001 +From e3df83da92875d8a125a2f6de8e06f3c49198786 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:33:34 +0100 Subject: [PATCH 10/49] ui/spice: default to pve certs unless otherwise 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 ced14a9..2cdc650 100644 --- a/debian/patches/pve/0011-introduce-new-vma-archive-format.patch +++ b/debian/patches/pve/0011-introduce-new-vma-archive-format.patch @@ -1,4 +1,4 @@ -From 5a684e9eb57192f1b772a6d7dae67857d72fae41 Mon Sep 17 00:00:00 2001 +From ab163668f7d9c9b8c6a16f2144268edb95586cd6 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 13 Nov 2012 11:11:38 +0100 Subject: [PATCH 11/49] introduce new vma archive format diff --git a/debian/patches/pve/0012-vma-add-verify-command.patch b/debian/patches/pve/0012-vma-add-verify-command.patch index 24d5cf7..60d369a 100644 --- a/debian/patches/pve/0012-vma-add-verify-command.patch +++ b/debian/patches/pve/0012-vma-add-verify-command.patch @@ -1,4 +1,4 @@ -From 93dc98fc5744c6f61ba74d0196d525190eee997b Mon Sep 17 00:00:00 2001 +From 606777f6aa96828549a080f650ed0130da3dbc0e Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 11 Mar 2013 07:07:46 +0100 Subject: [PATCH 12/49] vma: add verify command 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 ee2100a..4e4f8e4 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,4 +1,4 @@ -From abbfe2dd5318356fd422ec84c3088a94ea528943 Mon Sep 17 00:00:00 2001 +From 37542ea2439a0745015e885c57e2cc3e502dde47 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 14:46:49 +0100 Subject: [PATCH 13/49] vma: add 'config' command to dump the config diff --git a/debian/patches/pve/0014-backup-modify-job-api.patch b/debian/patches/pve/0014-backup-modify-job-api.patch index c64cc27..6af707a 100644 --- a/debian/patches/pve/0014-backup-modify-job-api.patch +++ b/debian/patches/pve/0014-backup-modify-job-api.patch @@ -1,4 +1,4 @@ -From 4291b03feee4f973686d67dc6e45ecd1ff374379 Mon Sep 17 00:00:00 2001 +From 33ef64ee185389d97f7d4f695d68bc33054de671 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:04:57 +0100 Subject: [PATCH 14/49] backup: modify job api @@ -242,7 +242,7 @@ index bf3c395eb4..60c6524417 100644 error_propagate(errp, local_err); backup_job_cleanup(bs); diff --git a/blockdev.c b/blockdev.c -index 040c152512..bb3fc5bd43 100644 +index 4927914ce3..5ddd363a33 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3273,7 +3273,7 @@ static BlockJob *do_drive_backup(DriveBackup *backup, BlockJobTxn *txn, 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 48bc4aa..1feb943 100644 --- a/debian/patches/pve/0015-backup-add-pve-monitor-commands.patch +++ b/debian/patches/pve/0015-backup-add-pve-monitor-commands.patch @@ -1,4 +1,4 @@ -From 678834d6358b6d784f7ae7b6df3476c4befa2073 Mon Sep 17 00:00:00 2001 +From 356514ad9830fea771dfa0aee2fd96d56d136595 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:20:56 +0100 Subject: [PATCH 15/49] backup: add pve monitor commands @@ -15,7 +15,7 @@ Subject: [PATCH 15/49] backup: add pve monitor commands 8 files changed, 668 insertions(+), 6 deletions(-) diff --git a/blockdev.c b/blockdev.c -index bb3fc5bd43..3e5c9ce593 100644 +index 5ddd363a33..58cf5d3c80 100644 --- a/blockdev.c +++ b/blockdev.c @@ -35,6 +35,7 @@ @@ -505,7 +505,7 @@ index bb3fc5bd43..3e5c9ce593 100644 bool has_base, const char *base, bool has_base_node, const char *base_node, diff --git a/blockjob.c b/blockjob.c -index 9b619f385a..54bd34a7db 100644 +index 6e489327ff..2162b4d3d8 100644 --- a/blockjob.c +++ b/blockjob.c @@ -37,8 +37,8 @@ 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 0f3cbc8..f6752fc 100644 --- a/debian/patches/pve/0016-backup-vma-add-dir-format.patch +++ b/debian/patches/pve/0016-backup-vma-add-dir-format.patch @@ -1,4 +1,4 @@ -From 670436d594b195b66d707c7554ca18ce46ecbca7 Mon Sep 17 00:00:00 2001 +From aab41cedea3fb8f1e8330191b9334e9fce0a71f8 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:21:54 +0100 Subject: [PATCH 16/49] backup: vma: add dir format @@ -12,7 +12,7 @@ Subject: [PATCH 16/49] backup: vma: add dir format 5 files changed, 111 insertions(+), 42 deletions(-) diff --git a/blockdev.c b/blockdev.c -index 3e5c9ce593..af1b9d4817 100644 +index 58cf5d3c80..87e1d1a99e 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3007,6 +3007,8 @@ typedef struct PVEBackupDevInfo { 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 6e64691..606a406 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,4 +1,4 @@ -From d28171e9e64cad9bb04dd68ef694126caab53154 Mon Sep 17 00:00:00 2001 +From 74c16a2631be564be69b0c337a4df3bc5d1e2e05 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:22:19 +0100 Subject: [PATCH 17/49] backup: do not return errors in dump callback @@ -8,7 +8,7 @@ Subject: [PATCH 17/49] backup: do not return errors in dump callback 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/blockdev.c b/blockdev.c -index af1b9d4817..4b073d4d9f 100644 +index 87e1d1a99e..5017c276e6 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3019,6 +3019,11 @@ static int pvebackup_dump_cb(void *opaque, BlockBackend *target, 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 c5bc4fc..2d54645 100644 --- a/debian/patches/pve/0018-backup-vma-correctly-propagate-error.patch +++ b/debian/patches/pve/0018-backup-vma-correctly-propagate-error.patch @@ -1,4 +1,4 @@ -From 0dad6b49846e109e3acdb1fa7e69081af20e5bcd Mon Sep 17 00:00:00 2001 +From c736903d735b9a7a7c6ca80c486d9064df5b2737 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:39:36 +0100 Subject: [PATCH 18/49] backup: vma: correctly propagate error @@ -10,7 +10,7 @@ Subject: [PATCH 18/49] backup: vma: correctly propagate error 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/blockdev.c b/blockdev.c -index 4b073d4d9f..6253ef1c5e 100644 +index 5017c276e6..d3aef2cc83 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3043,7 +3043,7 @@ static int pvebackup_dump_cb(void *opaque, BlockBackend *target, 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 38f8bfc..c83998f 100644 --- a/debian/patches/pve/0019-backup-vma-remove-async-queue.patch +++ b/debian/patches/pve/0019-backup-vma-remove-async-queue.patch @@ -1,4 +1,4 @@ -From 89c76cee2e39bd1e1a7b560b0a3eb5e83fa2bae8 Mon Sep 17 00:00:00 2001 +From f36eabd014acd6aaa9e90bba23fa6c1a329d7752 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:40:00 +0100 Subject: [PATCH 19/49] backup: vma: remove async queue @@ -9,7 +9,7 @@ Subject: [PATCH 19/49] backup: vma: remove async queue 2 files changed, 38 insertions(+), 147 deletions(-) diff --git a/blockdev.c b/blockdev.c -index 6253ef1c5e..ef159b0753 100644 +index d3aef2cc83..bad5b2a8b8 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3122,6 +3122,11 @@ static void pvebackup_cancel(void *opaque) 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 285b49b..eccfc3a 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,4 +1,4 @@ -From 25bc684248f21b1b947812b06777707537100a97 Mon Sep 17 00:00:00 2001 +From 80e10d8e1cca4a89fc24349b61bb6269267208fe Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:40:42 +0100 Subject: [PATCH 20/49] backup: vma: run flush inside coroutine @@ -9,7 +9,7 @@ Subject: [PATCH 20/49] backup: vma: run flush inside coroutine 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/blockdev.c b/blockdev.c -index ef159b0753..a9a900e6c8 100644 +index bad5b2a8b8..77ee7ff93b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3087,6 +3087,13 @@ static void pvebackup_cleanup(void) 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 a5f4250..ec21025 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,4 +1,4 @@ -From 3e22faf5b9a0572e2a91644306bdcd5f93a0af58 Mon Sep 17 00:00:00 2001 +From 38abda3a4e7ed915f97bcc241e77a0c72ab16d85 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 15:41:13 +0100 Subject: [PATCH 21/49] backup: do not use bdrv_drain_all @@ -8,7 +8,7 @@ Subject: [PATCH 21/49] backup: do not use bdrv_drain_all 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/blockdev.c b/blockdev.c -index a9a900e6c8..36b4083ae9 100644 +index 77ee7ff93b..2713585051 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3135,9 +3135,6 @@ static void pvebackup_cancel(void *opaque) diff --git a/debian/patches/pve/0022-internal-snapshot-async.patch b/debian/patches/pve/0022-internal-snapshot-async.patch index 189d071..cc218cd 100644 --- a/debian/patches/pve/0022-internal-snapshot-async.patch +++ b/debian/patches/pve/0022-internal-snapshot-async.patch @@ -1,4 +1,4 @@ -From dbd7eef96fe140c5ce332cee8173fe5b6ac44676 Mon Sep 17 00:00:00 2001 +From 4e68b29f5ceacac51af73b04b82a29a93d701c13 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 16:04:32 +0100 Subject: [PATCH 22/49] internal snapshot async @@ -33,10 +33,10 @@ index 9b12ee6afa..f5f8dbab3b 100644 common-obj-$(CONFIG_SPICE) += spice-qemu-char.o diff --git a/block.c b/block.c -index 927ba89eb7..884cbf83f2 100644 +index 1fbbb8d606..6ea9ed1c62 100644 --- a/block.c +++ b/block.c -@@ -3087,7 +3087,7 @@ out: +@@ -3091,7 +3091,7 @@ out: bdrv_unref(bs_new); } @@ -201,7 +201,7 @@ index 17a65b2313..8c1b4846b3 100644 void hmp_screendump(Monitor *mon, const QDict *qdict); void hmp_nbd_server_start(Monitor *mon, const QDict *qdict); diff --git a/include/block/block.h b/include/block/block.h -index 5149260827..b29c69d633 100644 +index 5ddc0cf21b..7eff87c7dd 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -295,6 +295,7 @@ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs, 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 ef2f7b8..1e1d5fc 100644 --- a/debian/patches/pve/0023-backup-vma-allow-empty-backups.patch +++ b/debian/patches/pve/0023-backup-vma-allow-empty-backups.patch @@ -1,4 +1,4 @@ -From 443de3d7bdffb7ddee0a048c4c3f370eaf0b45f2 Mon Sep 17 00:00:00 2001 +From 265314cc1f658f05f08c3c559bc4c2a36b1c68ce Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 16:31:51 +0100 Subject: [PATCH 23/49] backup: vma: allow empty backups 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 1c52ebf..9741f41 100644 --- a/debian/patches/pve/0024-qmp-add-get_link_status.patch +++ b/debian/patches/pve/0024-qmp-add-get_link_status.patch @@ -1,4 +1,4 @@ -From 8459f3c5a32357477435b7f094b3007928ec6d9e Mon Sep 17 00:00:00 2001 +From 9bfc746e546c37c2c8a28fb5470835cd24c92847 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 16:34:41 +0100 Subject: [PATCH 24/49] qmp: add get_link_status diff --git a/debian/patches/pve/0025-smm_available-false.patch b/debian/patches/pve/0025-smm_available-false.patch index 1547a09..6dd747f 100644 --- a/debian/patches/pve/0025-smm_available-false.patch +++ b/debian/patches/pve/0025-smm_available-false.patch @@ -1,4 +1,4 @@ -From 2d6d2c0c0945595f0e104b86924b2e8599f1bcde Mon Sep 17 00:00:00 2001 +From ab3e0d119f47b68fb2542d3320cd082b008efa5c Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Tue, 29 Sep 2015 15:37:44 +0200 Subject: [PATCH 25/49] smm_available = false 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 d9619f6..9999c12 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,4 +1,4 @@ -From fcb956b9bf1f3511f31cf406a121ef4894ce73f3 Mon Sep 17 00:00:00 2001 +From 5c4bb475402e8be8626858d2bf006cfd6ba4f632 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 16:50:05 +0100 Subject: [PATCH 26/49] use whitespace between VERSION and PKGVERSION diff --git a/debian/patches/pve/0027-vma-add-firewall.patch b/debian/patches/pve/0027-vma-add-firewall.patch index 2b39621..55365e8 100644 --- a/debian/patches/pve/0027-vma-add-firewall.patch +++ b/debian/patches/pve/0027-vma-add-firewall.patch @@ -1,4 +1,4 @@ -From bba85b2c9ffcc2e83e276f632c774126623a08b1 Mon Sep 17 00:00:00 2001 +From 233135d267465e89e19e065b1bbb1aeb6e217225 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 9 Dec 2015 16:51:23 +0100 Subject: [PATCH 27/49] vma: add firewall @@ -10,7 +10,7 @@ Subject: [PATCH 27/49] vma: add firewall 3 files changed, 50 insertions(+), 31 deletions(-) diff --git a/blockdev.c b/blockdev.c -index 36b4083ae9..3b823393bb 100644 +index 2713585051..43818dade1 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3163,6 +3163,44 @@ void qmp_backup_cancel(Error **errp) 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 5dd3928..c224d01 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,4 +1,4 @@ -From 69958cb77bf634951bde45a234871ca591e62dcc Mon Sep 17 00:00:00 2001 +From e6379574a7f9d5a83c4123c0a56855d2749d8365 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 10 Dec 2015 15:14:00 +0100 Subject: [PATCH 28/49] savevm-async: migration and bdrv_open update 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 2876de8..98b00e0 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,4 +1,4 @@ -From ea4b82c698e14c17393cbbaf49ef1e84a02603b8 Mon Sep 17 00:00:00 2001 +From 7263e17ea9663a32729e9336e8061577c4ffb2e8 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 12 Jan 2016 09:09:49 +0100 Subject: [PATCH 29/49] vnc: make x509 imply tls again diff --git a/debian/patches/pve/0030-PVE-VNC-authentication.patch b/debian/patches/pve/0030-PVE-VNC-authentication.patch index 5898883..f790bae 100644 --- a/debian/patches/pve/0030-PVE-VNC-authentication.patch +++ b/debian/patches/pve/0030-PVE-VNC-authentication.patch @@ -1,4 +1,4 @@ -From aeb28b3ef956941778dcfb395da885d53abb5a8d Mon Sep 17 00:00:00 2001 +From 6026cb51df5eba11827e016051279c273009845c Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 11 Jan 2016 10:40:31 +0100 Subject: [PATCH 30/49] PVE VNC authentication 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 16a738b..80fdcec 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,4 +1,4 @@ -From 478d42f3490bdb94360dc7ed6a3437007d0dc97c Mon Sep 17 00:00:00 2001 +From ae3c2403c6b1ef454d1aa197c141d51948ff605f Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 8 Feb 2016 08:23:34 +0100 Subject: [PATCH 31/49] vma-writer: don't bail out on zero-length files 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 38b1ac5..dd686db 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,4 +1,4 @@ -From 0f5c3683d083db785b56372367d54385102b4153 Mon Sep 17 00:00:00 2001 +From c1780d343b59c5ace49c665b32a7ea95f12113b2 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 23 Feb 2016 15:48:41 +0100 Subject: [PATCH 32/49] vma: better driver guessing for bdrv_open 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 f5ca074..b73ad83 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,4 +1,4 @@ -From 06a152c85ba52b0af3081ab678e860b05e316aea Mon Sep 17 00:00:00 2001 +From a007708c93cafd477fb9ba97b5bbf938ce6b06e0 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 17 Mar 2016 11:33:37 +0100 Subject: [PATCH 33/49] block: add the zeroinit block driver filter 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 1f7a0b8..74c09e3 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,4 +1,4 @@ -From 541834a4018302bea4e164ee7b09d080adcecb86 Mon Sep 17 00:00:00 2001 +From e97dd17b1c16589ea84369ac25cb56f799aa3da6 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 12 Apr 2016 13:49:44 +0200 Subject: [PATCH 34/49] vma: add format option to device mapping 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 0b81f42..fcb1c50 100644 --- a/debian/patches/pve/0035-fix-possible-unitialised-return-value.patch +++ b/debian/patches/pve/0035-fix-possible-unitialised-return-value.patch @@ -1,4 +1,4 @@ -From 2c724d4f2cc5da6664da260f437b76b7111f680f Mon Sep 17 00:00:00 2001 +From a8dc0625d8e4453c804838625e5d1425b2d32b7d Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 6 Apr 2016 16:45:15 +0200 Subject: [PATCH 35/49] fix possible unitialised return value diff --git a/debian/patches/pve/0036-vnc-refactor-to-QIOChannelSocket.patch b/debian/patches/pve/0036-vnc-refactor-to-QIOChannelSocket.patch index c1cb2a1..2ada245 100644 --- a/debian/patches/pve/0036-vnc-refactor-to-QIOChannelSocket.patch +++ b/debian/patches/pve/0036-vnc-refactor-to-QIOChannelSocket.patch @@ -1,4 +1,4 @@ -From eb44a5c162bb938cb0f7dfe920e32870540c3678 Mon Sep 17 00:00:00 2001 +From 04e6889e8d7864558b035433f3874a52f7812639 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 6 Apr 2016 16:47:54 +0200 Subject: [PATCH 36/49] vnc: refactor to QIOChannelSocket 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 a08c07e..942fa1f 100644 --- a/debian/patches/pve/0037-vma-use-BlockBackend-on-extract.patch +++ b/debian/patches/pve/0037-vma-use-BlockBackend-on-extract.patch @@ -1,4 +1,4 @@ -From 8be3faeadab088d717a91bfcad6c481bca0264f7 Mon Sep 17 00:00:00 2001 +From 7ebfbb540393217a1304b7d128f463e80c74702f Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 1 Jul 2016 15:47:29 +0200 Subject: [PATCH 37/49] vma: use BlockBackend on extract 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 71d6d9e..fae9839 100644 --- a/debian/patches/pve/0038-vma-byte-based-write-calls.patch +++ b/debian/patches/pve/0038-vma-byte-based-write-calls.patch @@ -1,4 +1,4 @@ -From e1e6c67464a39d9fe9e2133f4deaf4113df2b300 Mon Sep 17 00:00:00 2001 +From 865478a23fa7604a7bbf26bfcbae9ea6bdd93925 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 9 Sep 2016 14:51:28 +0200 Subject: [PATCH 38/49] vma: byte based write calls 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 64a14db..df4684b 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,4 +1,4 @@ -From a1759898bd5590543f712d707ffba2c9e8d92bd1 Mon Sep 17 00:00:00 2001 +From 41dfc58e3a9a0cb4e19a9adba588f66a92f0a446 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Tue, 26 Jul 2016 16:51:00 +0200 Subject: [PATCH 39/49] rbd: disable rbd_cache_writethrough_until_flush with 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 56f9d90..da0833a 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,4 +1,4 @@ -From 575f41c5a7a69d66479c709a8a30b6c2d2592dec Mon Sep 17 00:00:00 2001 +From 12098cd9f0b075da4bfb4b599f244eb9f9987443 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 1 Aug 2016 10:52:46 +0200 Subject: [PATCH 40/49] enable cache=unsafe for vma extract_content and diff --git a/debian/patches/pve/0041-savevm-async-updates.patch b/debian/patches/pve/0041-savevm-async-updates.patch index 95e687c..bf10524 100644 --- a/debian/patches/pve/0041-savevm-async-updates.patch +++ b/debian/patches/pve/0041-savevm-async-updates.patch @@ -1,4 +1,4 @@ -From 0bf0f6e121a93883fc5b575e6cdbdcc95e26db7e Mon Sep 17 00:00:00 2001 +From f03b2d0a470c6df14fcc37289e0976838af5d0ba Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 9 Sep 2016 15:21:19 +0200 Subject: [PATCH 41/49] savevm-async updates 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 e9972c0..fc82f70 100644 --- a/debian/patches/pve/0042-qmp_snapshot_drive-add-aiocontext.patch +++ b/debian/patches/pve/0042-qmp_snapshot_drive-add-aiocontext.patch @@ -1,4 +1,4 @@ -From bb3beef4498fdf2bd5aba2a5e91a4d889f7db0e1 Mon Sep 17 00:00:00 2001 +From 6b5bffa06f7d4ecfe32cc5f4e042717010888351 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Tue, 13 Sep 2016 01:57:56 +0200 Subject: [PATCH 42/49] qmp_snapshot_drive: add aiocontext 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 3807055..483351f 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,4 +1,4 @@ -From d35049d4852cde2197c74185ccb1c1d0869ebf82 Mon Sep 17 00:00:00 2001 +From 34ba9400b512af3cb51e103d31b2605c7179cb9d Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 21 Oct 2016 09:09:26 +0200 Subject: [PATCH 43/49] vma: sizes passed to blk_co_preadv should be bytes now 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 f27b4da..164e4d9 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,4 +1,4 @@ -From 74c0a7a984dde09ca789b6906418ec8ed98ece05 Mon Sep 17 00:00:00 2001 +From 88654f0f7d784c515dec351bbeb91a19be70ee13 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 24 Oct 2016 09:32:36 +0200 Subject: [PATCH 44/49] glusterfs: no default logfile if daemonized 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 08a955e..bb6f0b8 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,4 +1,4 @@ -From a9cab937a9406034b56a28ebd51d02bc6405cf4a Mon Sep 17 00:00:00 2001 +From dd810e797c9ec62737ad8a76d6a10d04e9d5d1aa Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Mon, 7 Nov 2016 11:47:50 +0100 Subject: [PATCH 45/49] qmp_delete_drive_snapshot : add aiocontext 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 e52e22e..7deea20 100644 --- a/debian/patches/pve/0046-convert-savevm-async-to-threads.patch +++ b/debian/patches/pve/0046-convert-savevm-async-to-threads.patch @@ -1,4 +1,4 @@ -From abc1172df5ed472111a8bed0336441449ba03d0c Mon Sep 17 00:00:00 2001 +From 49eb980458abc2a43499fa07078d5e772bd94ee0 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 8 Nov 2016 11:13:06 +0100 Subject: [PATCH 46/49] convert savevm-async to threads diff --git a/debian/patches/pve/0047-glusterfs-allow-partial-reads.patch b/debian/patches/pve/0047-glusterfs-allow-partial-reads.patch index 43fb8ed..954b8e7 100644 --- a/debian/patches/pve/0047-glusterfs-allow-partial-reads.patch +++ b/debian/patches/pve/0047-glusterfs-allow-partial-reads.patch @@ -1,4 +1,4 @@ -From a79af764a40e7587fe06ab058e42710253ddf686 Mon Sep 17 00:00:00 2001 +From 4ce0ea44bbdc0a0593a80733fb0ca71a6882a7d0 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 30 Nov 2016 10:27:47 +0100 Subject: [PATCH 47/49] glusterfs: allow partial reads 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 index 82acfee..b9be5fc 100644 --- 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 @@ -1,4 +1,4 @@ -From a334b486692afc5b5b7ffb55b661c5a0ad2c75e2 Mon Sep 17 00:00:00 2001 +From 5dfe68b80f11a2c797fda4f769e1c3342e7c959c Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 30 Mar 2017 16:05:34 +0200 Subject: [PATCH 48/49] vma: don't use O_DIRECT on pipes diff --git a/debian/patches/pve/0049-block-zeroinit-request-child-permissions.patch b/debian/patches/pve/0049-block-zeroinit-request-child-permissions.patch index 999b093..102f17e 100644 --- a/debian/patches/pve/0049-block-zeroinit-request-child-permissions.patch +++ b/debian/patches/pve/0049-block-zeroinit-request-child-permissions.patch @@ -1,4 +1,4 @@ -From e042ab947e3256e3a33f9fa5a21d8c01a667ff16 Mon Sep 17 00:00:00 2001 +From fb6d98f7215a8ce21f4b76fb9fbdcbb1cfe5c25a Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 31 Mar 2017 09:27:58 +0200 Subject: [PATCH 49/49] block: zeroinit: request child permissions diff --git a/debian/patches/series b/debian/patches/series index 8420bfc..e6fe8a7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -47,4 +47,3 @@ 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 pve/0049-block-zeroinit-request-child-permissions.patch -extra/0001-block-ignore-guest-dev-permissions-during-incoming-migration.patch diff --git a/qemu b/qemu index 1fde6ee..ca55019 160000 --- a/qemu +++ b/qemu @@ -1 +1 @@ -Subproject commit 1fde6ee885d3e778acb326cab9f7037939839537 +Subproject commit ca55019dacb821cc675273237a5173fc67bf3230