[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 01/24] file-win32: Fix "locking" option
From: |
Yonggang Luo |
Subject: |
[PATCH v4 01/24] file-win32: Fix "locking" option |
Date: |
Thu, 10 Sep 2020 00:14:21 +0800 |
From: Kevin Wolf <kwolf@redhat.com>
The intended behaviour was that locking=off/auto work and have no
effect (to remain compatible with file-posix), whereas locking=on would
return an error. Unfortunately, the code forgot to remove "locking" from
the options QDict, so any attempt to use the option would fail.
Replace the option parsing code for "locking" with something that is
part of the raw_runtime_opts QemuOptsList (so it is properly removed
from the QDict) and looks more like file-posix.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20200907092739.9988-1-kwolf@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/file-win32.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/block/file-win32.c b/block/file-win32.c
index ab69bd811a..e2900c3a51 100644
--- a/block/file-win32.c
+++ b/block/file-win32.c
@@ -299,6 +299,11 @@ static QemuOptsList raw_runtime_opts = {
.type = QEMU_OPT_STRING,
.help = "host AIO implementation (threads, native)",
},
+ {
+ .name = "locking",
+ .type = QEMU_OPT_STRING,
+ .help = "file locking mode (on/off/auto, default: auto)",
+ },
{ /* end of list */ }
},
};
@@ -333,6 +338,7 @@ static int raw_open(BlockDriverState *bs, QDict *options,
int flags,
Error *local_err = NULL;
const char *filename;
bool use_aio;
+ OnOffAuto locking;
int ret;
s->type = FTYPE_FILE;
@@ -343,10 +349,24 @@ static int raw_open(BlockDriverState *bs, QDict *options,
int flags,
goto fail;
}
- if (qdict_get_try_bool(options, "locking", false)) {
+ locking = qapi_enum_parse(&OnOffAuto_lookup,
+ qemu_opt_get(opts, "locking"),
+ ON_OFF_AUTO_AUTO, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ ret = -EINVAL;
+ goto fail;
+ }
+ switch (locking) {
+ case ON_OFF_AUTO_ON:
error_setg(errp, "locking=on is not supported on Windows");
ret = -EINVAL;
goto fail;
+ case ON_OFF_AUTO_OFF:
+ case ON_OFF_AUTO_AUTO:
+ break;
+ default:
+ g_assert_not_reached();
}
filename = qemu_opt_get(opts, "filename");
--
2.28.0.windows.1
- [PATCH v4 00/24] W32, W64 msys2/mingw patches, Yonggang Luo, 2020/09/09
- [PATCH v4 01/24] file-win32: Fix "locking" option,
Yonggang Luo <=
- [PATCH v4 02/24] rcu: Implement drain_call_rcu, Yonggang Luo, 2020/09/09
- [PATCH v4 04/24] ci: fixes msys2 build by upgrading capstone to 4.0.2, Yonggang Luo, 2020/09/09
- [PATCH v4 05/24] configure: Fixes ncursesw detection under msys2/mingw and enable curses, Yonggang Luo, 2020/09/09
- [PATCH v4 06/24] win32: Simplify gmtime_r detection direct base on _POSIX_THREAD_SAFE_FUNCTIONS., Yonggang Luo, 2020/09/09
- [PATCH v4 15/24] vmstate: Fixes test-vmstate.c on msys2/mingw, Yonggang Luo, 2020/09/09
- [PATCH v4 16/24] cirrus: Building freebsd in a single short, Yonggang Luo, 2020/09/09
- [PATCH v4 20/24] tests: Fixes test-io-channel-file by mask only owner file state mask bits, Yonggang Luo, 2020/09/09
- [PATCH v4 23/24] rcu: fixes test-logging.c by call drain_call_rcu before rmdir_full, Yonggang Luo, 2020/09/09
- [PATCH v4 24/24] ci: Enable msys2 ci in cirrus, Yonggang Luo, 2020/09/09