dc9827a6a4
Only very minor changes needed:
* Most patches in extra (or some version of them) are part of 7.0.0.
* aio_set_fd_handler got an extra parameter, but can just pass NULL
like we did for the related 'poll' parameter. See QEMU commit
826cc32423db2a99d184dbf4f507c737d7e7a4ae for more.
* Add include for qemu/memalign.h in vma.c and vma-writer.c.
* Add reverts for fixups of already reverted 0347a8fd4c ("block/rbd:
implement bdrv_co_block_status") that came in with 7.0.0. Those
fixups are not enough, see Proxmox bugzilla #4047.
* Two trivial context changes for bitmap-mirror patches.
* block_int.h got split up into multiple headers.
* Some context changes in configure and meson.build.
* Used the oppurtunity to squash fixup of bdrv_backuo_dump_create typo
in a later patch into the patch introducing the function (had to
move code to new header during rebase).
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
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
|
|
supports any locking, causing issues with NFS.
|
|
|
|
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
block/file-posix.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/block/file-posix.c b/block/file-posix.c
|
|
index 39a3d6dbe6..e5bf5d59bf 100644
|
|
--- a/block/file-posix.c
|
|
+++ b/block/file-posix.c
|
|
@@ -554,7 +554,7 @@ static QemuOptsList raw_runtime_opts = {
|
|
{
|
|
.name = "locking",
|
|
.type = QEMU_OPT_STRING,
|
|
- .help = "file locking mode (on/off/auto, default: auto)",
|
|
+ .help = "file locking mode (on/off/auto, default: off)",
|
|
},
|
|
{
|
|
.name = "pr-manager",
|
|
@@ -654,7 +654,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
|
|
s->use_lock = false;
|
|
break;
|
|
case ON_OFF_AUTO_AUTO:
|
|
- s->use_lock = qemu_has_ofd_lock();
|
|
+ s->use_lock = false;
|
|
break;
|
|
default:
|
|
abort();
|