[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 12/22] qemu-nbd: Add "--no-lock/-L" option
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v6 12/22] qemu-nbd: Add "--no-lock/-L" option |
Date: |
Fri, 3 Jun 2016 16:49:06 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
qemu-nbd.c | 7 ++++++-
qemu-nbd.texi | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 6554f0a..6adfc46 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -98,6 +98,7 @@ static void usage(const char *name)
"Block device options:\n"
" -f, --format=FORMAT set image format (raw, qcow2, ...)\n"
" -r, --read-only export read-only\n"
+" -L, --no-lock disable image locking\n"
" -s, --snapshot use FILE as an external snapshot, create a
temporary\n"
" file with backing_file=FILE, redirect the write
to\n"
" the temporary one\n"
@@ -470,7 +471,7 @@ int main(int argc, char **argv)
off_t fd_size;
QemuOpts *sn_opts = NULL;
const char *sn_id_or_name = NULL;
- const char *sopt = "hVb:o:p:rsnP:c:dvk:e:f:tl:x:";
+ const char *sopt = "hVb:o:p:rsnLP:c:dvk:e:f:tl:x:";
struct option lopt[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' },
@@ -479,6 +480,7 @@ int main(int argc, char **argv)
{ "socket", required_argument, NULL, 'k' },
{ "offset", required_argument, NULL, 'o' },
{ "read-only", no_argument, NULL, 'r' },
+ { "no-lock", no_argument, NULL, 'L' },
{ "partition", required_argument, NULL, 'P' },
{ "connect", required_argument, NULL, 'c' },
{ "disconnect", no_argument, NULL, 'd' },
@@ -631,6 +633,9 @@ int main(int argc, char **argv)
nbdflags |= NBD_FLAG_READ_ONLY;
flags &= ~BDRV_O_RDWR;
break;
+ case 'L':
+ flags |= BDRV_O_NO_LOCK;
+ break;
case 'P':
partition = strtol(optarg, &end, 0);
if (*end) {
diff --git a/qemu-nbd.texi b/qemu-nbd.texi
index 9f23343..6b7b1d1 100644
--- a/qemu-nbd.texi
+++ b/qemu-nbd.texi
@@ -43,6 +43,8 @@ Force the use of the block driver for format @var{fmt}
instead of
auto-detecting
@item -r, --read-only
Export the disk as read-only
address@hidden -L, --no-lock
+Disable image locking
@item -P, address@hidden
Only expose partition @var{num}
@item -s, --snapshot
--
2.8.2
- [Qemu-devel] [PATCH v6 07/22] raw-posix: Use qemu_dup, (continued)
- [Qemu-devel] [PATCH v6 08/22] raw-posix: Add image locking support, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 12/22] qemu-nbd: Add "--no-lock/-L" option,
Fam Zheng <=
- [Qemu-devel] [PATCH v6 10/22] qemu-img: Add "-L" option to sub commands, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 13/22] block: Don't lock drive-backup target image in none mode, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 11/22] qemu-img: Update documentation of "-L" option, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 14/22] mirror: Disable image locking on target backing chain, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 17/22] qemu-iotests: 030: Disable image locking when checking test image, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 16/22] qemu-iotests: Wait for QEMU processes before checking image in 091, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 15/22] qemu-iotests: 046: Move version detection out from verify_io, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 18/22] iotests: 087: Disable image locking in cases where file is shared, Fam Zheng, 2016/06/03