[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v17 15/23] file-posix: Add 'locking' option
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v17 15/23] file-posix: Add 'locking' option |
Date: |
Wed, 3 May 2017 00:35:50 +0800 |
Making this option available even before implementing it will let
converting tests easier: in coming patches they can specify the option
already when necessary, before we actually write code to lock the
images.
Signed-off-by: Fam Zheng <address@hidden>
---
block/file-posix.c | 5 +++++
qapi/block-core.json | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/block/file-posix.c b/block/file-posix.c
index 1941fb6..261563d 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -392,6 +392,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 */ }
},
};
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 1cf29a1..29d3040 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2127,11 +2127,15 @@
#
# @filename: path to the image file
# @aio: AIO backend (default: threads) (since: 2.8)
+# @locking: whether to enable file locking. If set to 'auto', only enable
+# when Open File Descriptor (OFD) locking API is available
+# (default: auto, since 2.10)
#
# Since: 2.9
##
{ 'struct': 'BlockdevOptionsFile',
'data': { 'filename': 'str',
+ '*locking': 'OnOffAuto',
'*aio': 'BlockdevAioOptions' } }
##
--
2.9.3
- [Qemu-block] [PATCH v17 05/23] qemu-img: Update documentation for -U, (continued)
- [Qemu-block] [PATCH v17 05/23] qemu-img: Update documentation for -U, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 06/23] qemu-io: Add --force-share option, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 08/23] iotests: 046: Prepare for image locking, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 07/23] iotests: 030: Prepare for image locking, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 09/23] iotests: 055: Don't attach the target image already for drive-backup, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 11/23] iotests: 087: Don't attach test image twice, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 10/23] iotests: 085: Avoid image locking conflict, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 12/23] iotests: 091: Quit QEMU before checking image, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 13/23] iotests: 172: Use separate images for multiple devices, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 14/23] tests: Use null-co:// instead of /dev/null as the dummy image, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 15/23] file-posix: Add 'locking' option,
Fam Zheng <=
- [Qemu-block] [PATCH v17 16/23] file-win32: Error out if locking=on, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 17/23] tests: Disable image lock in test-replication, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 18/23] block: Reuse bs as backing hd for drive-backup sync=none, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 19/23] osdep: Add qemu_lock_fd and qemu_unlock_fd, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 20/23] osdep: Fall back to posix lock when OFD lock is unavailable, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 21/23] file-posix: Add image locking to perm operations, Fam Zheng, 2017/05/02
- [Qemu-block] [PATCH v17 23/23] tests: Add POSIX image locking test case 182, Fam Zheng, 2017/05/02