[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.7 v2 08/17] qemu-io: Add "-L" option for BDRV_
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH for-2.7 v2 08/17] qemu-io: Add "-L" option for BDRV_O_NO_LOCK |
Date: |
Fri, 15 Apr 2016 11:27:58 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
qemu-io.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index 288bba8..6bb6232 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -107,6 +107,7 @@ static void open_help(void)
" -r, -- open file read-only\n"
" -s, -- use snapshot file\n"
" -n, -- disable host cache\n"
+" -L, -- disable image lock\n"
" -o, -- options to be given to the block driver"
"\n");
}
@@ -139,12 +140,13 @@ static int open_f(BlockBackend *blk, int argc, char
**argv)
{
int flags = 0;
int readonly = 0;
+ int nolock = 0;
bool writethrough = true;
int c;
QemuOpts *qopts;
QDict *opts;
- while ((c = getopt(argc, argv, "snrgo:")) != -1) {
+ while ((c = getopt(argc, argv, "snrgLo:")) != -1) {
switch (c) {
case 's':
flags |= BDRV_O_SNAPSHOT;
@@ -156,6 +158,9 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
case 'r':
readonly = 1;
break;
+ case 'L':
+ nolock = 1;
+ break;
case 'o':
if (imageOpts) {
printf("--image-opts and 'open -o' are mutually exclusive\n");
@@ -176,6 +181,10 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
flags |= BDRV_O_RDWR;
}
+ if (nolock) {
+ flags |= BDRV_O_NO_LOCK;
+ }
+
if (imageOpts && (optind == argc - 1)) {
if (!qemu_opts_parse_noisily(&empty_opts, argv[optind], false)) {
qemu_opts_reset(&empty_opts);
@@ -410,7 +419,8 @@ static QemuOptsList file_opts = {
int main(int argc, char **argv)
{
int readonly = 0;
- const char *sopt = "hVc:d:f:rsnmgkt:T:";
+ int nolock = 0;
+ const char *sopt = "hVc:d:f:rLsnmgkt:T:";
const struct option lopt[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' },
@@ -418,6 +428,7 @@ int main(int argc, char **argv)
{ "cmd", required_argument, NULL, 'c' },
{ "format", required_argument, NULL, 'f' },
{ "read-only", no_argument, NULL, 'r' },
+ { "no-lock", no_argument, NULL, 'L' },
{ "snapshot", no_argument, NULL, 's' },
{ "nocache", no_argument, NULL, 'n' },
{ "misalign", no_argument, NULL, 'm' },
@@ -477,6 +488,9 @@ int main(int argc, char **argv)
case 'r':
readonly = 1;
break;
+ case 'L':
+ nolock = 1;
+ break;
case 'm':
qemuio_misalign = true;
break;
@@ -558,6 +572,10 @@ int main(int argc, char **argv)
flags |= BDRV_O_RDWR;
}
+ if (nolock) {
+ flags |= BDRV_O_NO_LOCK;
+ }
+
if ((argc - optind) == 1) {
if (imageOpts) {
QemuOpts *qopts = NULL;
--
2.8.0
- Re: [Qemu-devel] [PATCH for-2.7 v2 05/17] raw-posix: Implement .bdrv_lockf, (continued)
- [Qemu-devel] [PATCH for-2.7 v2 06/17] gluster: Implement .bdrv_lockf, Fam Zheng, 2016/04/14
- [Qemu-devel] [PATCH for-2.7 v2 07/17] rbd: Implement image locking, Fam Zheng, 2016/04/14
- Re: [Qemu-devel] [PATCH for-2.7 v2 07/17] rbd: Implement image locking, Jason Dillaman, 2016/04/22
- Re: [Qemu-devel] [PATCH for-2.7 v2 07/17] rbd: Implement image locking, Fam Zheng, 2016/04/24
- Re: [Qemu-devel] [PATCH for-2.7 v2 07/17] rbd: Implement image locking, Jason Dillaman, 2016/04/26
- Re: [Qemu-devel] [PATCH for-2.7 v2 07/17] rbd: Implement image locking, Fam Zheng, 2016/04/26
- Re: [Qemu-devel] [PATCH for-2.7 v2 07/17] rbd: Implement image locking, Jason Dillaman, 2016/04/27
- Re: [Qemu-devel] [PATCH for-2.7 v2 07/17] rbd: Implement image locking, Fam Zheng, 2016/04/27
[Qemu-devel] [PATCH for-2.7 v2 08/17] qemu-io: Add "-L" option for BDRV_O_NO_LOCK,
Fam Zheng <=
[Qemu-devel] [PATCH for-2.7 v2 09/17] qemu-img: Add "-L" option to sub commands, Fam Zheng, 2016/04/14
[Qemu-devel] [PATCH for-2.7 v2 11/17] qemu-nbd: Add "--no-lock/-L" option, Fam Zheng, 2016/04/14
[Qemu-devel] [PATCH for-2.7 v2 12/17] qemu-iotests: 140: Disable image lock for qemu-io access, Fam Zheng, 2016/04/14