If specified, BDRV_O_NO_LOCK flag will be set when opening the image. Signed-off-by: Fam Zheng <f...@redhat.com> --- qemu-img.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 19 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c index ceffefe..e8d0e78 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -616,6 +616,7 @@ static int img_check(int argc, char **argv) ImageCheck *check; bool quiet = false; bool image_opts = false; + bool nolock = false; fmt = NULL; output = NULL; @@ -632,7 +633,7 @@ static int img_check(int argc, char **argv) {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "hf:r:T:q", + c = getopt_long(argc, argv, "hf:r:T:qL", long_options, &option_index); if (c == -1) { break; @@ -666,6 +667,9 @@ static int img_check(int argc, char **argv) case 'q': quiet = true; break; + case 'L': + nolock = true; + break; case OPTION_OBJECT: { QemuOpts *opts; opts = qemu_opts_parse_noisily(&qemu_object_opts, @@ -699,6 +703,7 @@ static int img_check(int argc, char **argv) return 1; } + flags |= nolock ? BDRV_O_NO_LOCK : 0; ret = bdrv_parse_cache_mode(cache, &flags, &writethrough); if (ret < 0) { error_report("Invalid source cache option: %s", cache); @@ -819,6 +824,7 @@ static int img_commit(int argc, char **argv) Error *local_err = NULL; CommonBlockJobCBInfo cbi; bool image_opts = false; + bool nolock = false; fmt = NULL; cache = BDRV_DEFAULT_CACHE; @@ -830,7 +836,7 @@ static int img_commit(int argc, char **argv) {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "f:ht:b:dpq", + c = getopt_long(argc, argv, "f:ht:b:dpqL", long_options, NULL); if (c == -1) { break; @@ -860,6 +866,9 @@ static int img_commit(int argc, char **argv) case 'q': quiet = true; break; + case 'L': + nolock = true; + break; case OPTION_OBJECT: { QemuOpts *opts; opts = qemu_opts_parse_noisily(&qemu_object_opts, @@ -891,6 +900,7 @@ static int img_commit(int argc, char **argv) } flags = BDRV_O_RDWR | BDRV_O_UNMAP; + flags |= nolock ? BDRV_O_NO_LOCK : 0; ret = bdrv_parse_cache_mode(cache, &flags, &writethrough); if (ret < 0) { error_report("Invalid cache option: %s", cache); @@ -1149,6 +1159,7 @@ static int img_compare(int argc, char **argv) int c, pnum; uint64_t progress_base; bool image_opts = false; + bool nolock = false; cache = BDRV_DEFAULT_CACHE; for (;;) { @@ -1158,7 +1169,7 @@ static int img_compare(int argc, char **argv) {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "hf:F:T:pqs", + c = getopt_long(argc, argv, "hf:F:T:pqsL", long_options, NULL); if (c == -1) { break; @@ -1186,6 +1197,9 @@ static int img_compare(int argc, char **argv) case 's': strict = true; break; + case 'L': + nolock = true; + break; case OPTION_OBJECT: { QemuOpts *opts; opts = qemu_opts_parse_noisily(&qemu_object_opts, @@ -1223,7 +1237,7 @@ static int img_compare(int argc, char **argv) /* Initialize before goto out */ qemu_progress_init(progress, 2.0); - flags = 0; + flags = nolock ? BDRV_O_NO_LOCK : 0; ret = bdrv_parse_cache_mode(cache, &flags, &writethrough); if (ret < 0) { error_report("Invalid source cache option: %s", cache); @@ -1774,6 +1788,7 @@ static int img_convert(int argc, char **argv) QemuOpts *sn_opts = NULL; ImgConvertState state; bool image_opts = false; + bool nolock = false; fmt = NULL; out_fmt = "raw"; @@ -1789,7 +1804,7 @@ static int img_convert(int argc, char **argv) {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "hf:O:B:ce6o:s:l:S:pt:T:qn", + c = getopt_long(argc, argv, "hf:O:B:ce6o:s:l:S:pt:T:qnL", long_options, NULL); if (c == -1) { break; @@ -1878,6 +1893,9 @@ static int img_convert(int argc, char **argv) case 'q': quiet = true; break; + case 'L': + nolock = true; + break; case 'n': skip_create = 1; break; @@ -1926,7 +1944,7 @@ static int img_convert(int argc, char **argv) goto out; } - src_flags = 0; + src_flags = nolock ? BDRV_O_NO_LOCK : 0; ret = bdrv_parse_cache_mode(src_cache, &src_flags, &src_writethrough); if (ret < 0) { error_report("Invalid source cache option: %s", src_cache); @@ -2076,6 +2094,7 @@ static int img_convert(int argc, char **argv) } flags = min_sparse ? (BDRV_O_RDWR | BDRV_O_UNMAP) : BDRV_O_RDWR; + flags |= nolock ? BDRV_O_NO_LOCK : 0; ret = bdrv_parse_cache_mode(cache, &flags, &writethrough); if (ret < 0) { error_report("Invalid cache option: %s", cache); @@ -2256,12 +2275,14 @@ static gboolean str_equal_func(gconstpointer a, gconstpointer b) static ImageInfoList *collect_image_info_list(bool image_opts, const char *filename, const char *fmt, - bool chain) + bool chain, + bool nolock) { ImageInfoList *head = NULL; ImageInfoList **last = &head; GHashTable *filenames; Error *err = NULL; + int flags; filenames = g_hash_table_new_full(g_str_hash, str_equal_func, NULL, NULL); @@ -2278,8 +2299,9 @@ static ImageInfoList *collect_image_info_list(bool image_opts, } g_hash_table_insert(filenames, (gpointer)filename, NULL); - blk = img_open(image_opts, filename, fmt, - BDRV_O_NO_BACKING | BDRV_O_NO_IO, false, false); + flags = BDRV_O_NO_BACKING | BDRV_O_NO_IO; + flags |= nolock ? BDRV_O_NO_LOCK : 0; + blk = img_open(image_opts, filename, fmt, flags, false, false); if (!blk) { goto err; } @@ -2331,6 +2353,7 @@ static int img_info(int argc, char **argv) const char *filename, *fmt, *output; ImageInfoList *list; bool image_opts = false; + bool nolock = false; fmt = NULL; output = NULL; @@ -2345,7 +2368,7 @@ static int img_info(int argc, char **argv) {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "f:h", + c = getopt_long(argc, argv, "f:hL", long_options, &option_index); if (c == -1) { break; @@ -2358,6 +2381,9 @@ static int img_info(int argc, char **argv) case 'f': fmt = optarg; break; + case 'L': + nolock = true; + break; case OPTION_OUTPUT: output = optarg; break; @@ -2397,7 +2423,7 @@ static int img_info(int argc, char **argv) return 1; } - list = collect_image_info_list(image_opts, filename, fmt, chain); + list = collect_image_info_list(image_opts, filename, fmt, chain, nolock); if (!list) { return 1; } @@ -2543,6 +2569,8 @@ static int img_map(int argc, char **argv) MapEntry curr = { .length = 0 }, next; int ret = 0; bool image_opts = false; + bool nolock = false; + int flags; fmt = NULL; output = NULL; @@ -2556,7 +2584,7 @@ static int img_map(int argc, char **argv) {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "f:h", + c = getopt_long(argc, argv, "f:hL", long_options, &option_index); if (c == -1) { break; @@ -2569,6 +2597,9 @@ static int img_map(int argc, char **argv) case 'f': fmt = optarg; break; + case 'L': + nolock = true; + break; case OPTION_OUTPUT: output = optarg; break; @@ -2605,7 +2636,8 @@ static int img_map(int argc, char **argv) return 1; } - blk = img_open(image_opts, filename, fmt, 0, false, false); + flags = nolock ? BDRV_O_NO_LOCK : 0; + blk = img_open(image_opts, filename, fmt, flags, false, false); if (!blk) { return 1; } @@ -2668,6 +2700,7 @@ static int img_snapshot(int argc, char **argv) bool quiet = false; Error *err = NULL; bool image_opts = false; + bool nolock = false; bdrv_oflags = BDRV_O_RDWR; /* Parse commandline parameters */ @@ -2678,7 +2711,7 @@ static int img_snapshot(int argc, char **argv) {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "la:c:d:hq", + c = getopt_long(argc, argv, "la:c:d:hqL", long_options, NULL); if (c == -1) { break; @@ -2723,6 +2756,9 @@ static int img_snapshot(int argc, char **argv) case 'q': quiet = true; break; + case 'L': + nolock = true; + break; case OPTION_OBJECT: { QemuOpts *opts; opts = qemu_opts_parse_noisily(&qemu_object_opts, @@ -2748,6 +2784,7 @@ static int img_snapshot(int argc, char **argv) return 1; } + bdrv_oflags |= nolock ? BDRV_O_NO_LOCK : 0; /* Open the image */ blk = img_open(image_opts, filename, NULL, bdrv_oflags, false, quiet); if (!blk) { @@ -2817,6 +2854,7 @@ static int img_rebase(int argc, char **argv) bool quiet = false; Error *local_err = NULL; bool image_opts = false; + bool nolock = false; /* Parse commandline parameters */ fmt = NULL; @@ -2831,7 +2869,7 @@ static int img_rebase(int argc, char **argv) {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "hf:F:b:upt:T:q", + c = getopt_long(argc, argv, "hf:F:b:upt:T:qL", long_options, NULL); if (c == -1) { break; @@ -2862,6 +2900,9 @@ static int img_rebase(int argc, char **argv) case 'T': src_cache = optarg; break; + case 'L': + nolock = true; + break; case 'q': quiet = true; break; @@ -2901,6 +2942,7 @@ static int img_rebase(int argc, char **argv) qemu_progress_print(0, 100); flags = BDRV_O_RDWR | (unsafe ? BDRV_O_NO_BACKING : 0); + flags |= nolock ? BDRV_O_NO_LOCK : 0; ret = bdrv_parse_cache_mode(cache, &flags, &writethrough); if (ret < 0) { error_report("Invalid cache option: %s", cache); @@ -3162,6 +3204,8 @@ static int img_resize(int argc, char **argv) bool quiet = false; BlockBackend *blk = NULL; QemuOpts *param; + int flags; + bool nolock = false; static QemuOptsList resize_options = { .name = "resize_options", @@ -3196,7 +3240,7 @@ static int img_resize(int argc, char **argv) {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "f:hq", + c = getopt_long(argc, argv, "f:hqL", long_options, NULL); if (c == -1) { break; @@ -3212,6 +3256,9 @@ static int img_resize(int argc, char **argv) case 'q': quiet = true; break; + case 'L': + nolock = true; + break; case OPTION_OBJECT: { QemuOpts *opts; opts = qemu_opts_parse_noisily(&qemu_object_opts, @@ -3263,8 +3310,9 @@ static int img_resize(int argc, char **argv) n = qemu_opt_get_size(param, BLOCK_OPT_SIZE, 0); qemu_opts_del(param); - blk = img_open(image_opts, filename, fmt, - BDRV_O_RDWR, false, quiet); + flags = BDRV_O_RDWR; + flags |= nolock ? BDRV_O_NO_LOCK : 0; + blk = img_open(image_opts, filename, fmt, flags, false, quiet); if (!blk) { ret = -1; goto out; @@ -3325,6 +3373,7 @@ static int img_amend(int argc, char **argv) BlockBackend *blk = NULL; BlockDriverState *bs = NULL; bool image_opts = false; + bool nolock = false; cache = BDRV_DEFAULT_CACHE; for (;;) { @@ -3334,7 +3383,7 @@ static int img_amend(int argc, char **argv) {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "ho:f:t:pq", + c = getopt_long(argc, argv, "ho:f:t:pqL", long_options, NULL); if (c == -1) { break; @@ -3371,6 +3420,9 @@ static int img_amend(int argc, char **argv) case 'q': quiet = true; break; + case 'L': + nolock = true; + break; case OPTION_OBJECT: opts = qemu_opts_parse_noisily(&qemu_object_opts, optarg, true); @@ -3416,6 +3468,7 @@ static int img_amend(int argc, char **argv) } flags = BDRV_O_RDWR; + flags |= nolock ? BDRV_O_NO_LOCK : 0; ret = bdrv_parse_cache_mode(cache, &flags, &writethrough); if (ret < 0) { error_report("Invalid cache option: %s", cache); -- 2.7.4