mirror of
https://git.proxmox.com/git/pve-qemu
synced 2025-08-24 09:05:01 +00:00
670aa8ecdf
Notable changes:
* Commit 07bea2d35f ("block-backend: Remove deadcode") removed
blk_op_{,un}block_all() which was used by PVE async savevm code.
Fixed by switching to using bdrv_op_{,un}block_all().
* Drop patches that are already part of upstream.
Signed-off-by: Fiona Ebner <f.ebner@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 90fa54352c..e2ea071315 100644
|
|
--- a/block/file-posix.c
|
|
+++ b/block/file-posix.c
|
|
@@ -564,7 +564,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",
|
|
@@ -664,7 +664,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();
|