[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/16] block: get file-win32.c handle locking option consistence w
From: |
Yonggang Luo |
Subject: |
[PULL 08/16] block: get file-win32.c handle locking option consistence with file-posix.c |
Date: |
Wed, 9 Sep 2020 02:49:10 +0800 |
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
block/file-win32.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/block/file-win32.c b/block/file-win32.c
index ab69bd811a..14e5f5c3b5 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 */ }
},
};
@@ -334,6 +339,7 @@ static int raw_open(BlockDriverState *bs, QDict *options,
int flags,
const char *filename;
bool use_aio;
int ret;
+ OnOffAuto locking;
s->type = FTYPE_FILE;
@@ -342,11 +348,24 @@ static int raw_open(BlockDriverState *bs, QDict *options,
int flags,
ret = -EINVAL;
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
- Re: [PULL 01/16] block: Fixes nfs on msys2/mingw, (continued)
- [PULL 02/16] ci: fixes msys2 build by upgrading capstone to 4.0.2, Yonggang Luo, 2020/09/08
- [PULL 04/16] curses: Fixes curses compiling errors., Yonggang Luo, 2020/09/08
- [PULL 05/16] tests: disable /char/stdio/* tests in test-char.c on win32, Yonggang Luo, 2020/09/08
- [PULL 03/16] configure: Fixes ncursesw detection under msys2/mingw and enable curses, Yonggang Luo, 2020/09/08
- [PULL 06/16] ci: Enable msys2 ci in cirrus, Yonggang Luo, 2020/09/08
- [PULL 07/16] tests: Trying fixes test-replication.c on msys2/mingw., Yonggang Luo, 2020/09/08
- [PULL 08/16] block: get file-win32.c handle locking option consistence with file-posix.c,
Yonggang Luo <=
- [PULL 09/16] osdep: These function are only available on Non-Win32 system., Yonggang Luo, 2020/09/08
- [PULL 10/16] meson: Use -b to ignore CR vs. CR-LF issues on Windows, Yonggang Luo, 2020/09/08
- [PULL 11/16] meson: disable crypto tests are empty under win32, Yonggang Luo, 2020/09/08
- [PULL 12/16] meson: remove empty else and duplicated gio deps, Yonggang Luo, 2020/09/08
- [PULL 13/16] vmstate: Fixes test-vmstate.c on msys2/mingw, Yonggang Luo, 2020/09/08
- [PULL 14/16] cirrus: Building freebsd in a single short, Yonggang Luo, 2020/09/08
- [PULL 15/16] logging: Fixes memory leak in test-logging.c, Yonggang Luo, 2020/09/08
- [PULL 16/16] rcu: add uninit destructor for rcu, Yonggang Luo, 2020/09/08
- Re: [PULL 00/16] Msys2 patches patches, Eric Blake, 2020/09/08