update and rebase to QEMU v6.1.0

[pve-qemu.git] / debian / patches / pve / 0001-PVE-Config-block-file-change-locking-default-to-off.patch

diff --git a/debian/patches/pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch b/debian/patches/pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch
index f58172854b33ec6d573316457f816c41080e9c54..07e4f2e7668b8a5166aa39f849624c4b4702f75a 100644 (file)
--- a/debian/patches/pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch
+++ b/debian/patches/pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Tue, 10 Mar 2020 12:54:58 +0100
-Subject: [PATCH 01/32] PVE: [Config] block/file: change locking default to off
+Date: Mon, 6 Apr 2020 12:16:30 +0200
+Subject: [PATCH] PVE: [Config] block/file: change locking default to off
 
 'auto' only checks whether the system generally supports OFD
 locks but not whether the storage the file resides on
@@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/block/file-posix.c b/block/file-posix.c
-index 1b805bd938..44b49265ae 100644
+index cb9bffe047..1bbeb9e658 100644
 --- a/block/file-posix.c
 +++ b/block/file-posix.c
-@@ -449,7 +449,7 @@ static QemuOptsList raw_runtime_opts = {
+@@ -533,7 +533,7 @@ static QemuOptsList raw_runtime_opts = {
          {
              .name = "locking",
              .type = QEMU_OPT_STRING,
@@ -26,7 +26,7 @@ index 1b805bd938..44b49265ae 100644
          },
          {
              .name = "pr-manager",
-@@ -538,7 +538,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
+@@ -631,7 +631,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
          s->use_lock = false;
          break;
      case ON_OFF_AUTO_AUTO: