[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [Qemu-block] [PATCH for-2.10 4/5] qemu-io: Allow reopen
From: |
Jeff Cody |
Subject: |
Re: [Qemu-devel] [Qemu-block] [PATCH for-2.10 4/5] qemu-io: Allow reopen read-write |
Date: |
Thu, 3 Aug 2017 12:25:58 -0400 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Thu, Aug 03, 2017 at 05:03:00PM +0200, Kevin Wolf wrote:
> This allows qemu-iotests to test the switch between read-only and
> read-write mode for block devices.
>
> Signed-off-by: Kevin Wolf <address@hidden>
> ---
> qemu-io-cmds.c | 19 +++++++++++++++++--
> 1 file changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
> index 3eb42c6728..2811a89099 100644
> --- a/qemu-io-cmds.c
> +++ b/qemu-io-cmds.c
> @@ -1920,6 +1920,7 @@ static void reopen_help(void)
> " 'reopen -o lazy-refcounts=on' - activates lazy refcount writeback on a
> qcow2 image\n"
> "\n"
> " -r, -- Reopen the image read-only\n"
> +" -w, -- Reopen the image read-write\n"
> " -c, -- Change the cache mode to the given value\n"
> " -o, -- Changes block driver options (cf. 'open' command)\n"
> "\n");
> @@ -1942,7 +1943,7 @@ static const cmdinfo_t reopen_cmd = {
> .argmin = 0,
> .argmax = -1,
> .cfunc = reopen_f,
> - .args = "[-r] [-c cache] [-o options]",
> + .args = "[(-r|-w)] [-c cache] [-o options]",
> .oneline = "reopens an image with new options",
> .help = reopen_help,
> };
> @@ -1955,11 +1956,12 @@ static int reopen_f(BlockBackend *blk, int argc, char
> **argv)
> int c;
> int flags = bs->open_flags;
> bool writethrough = !blk_enable_write_cache(blk);
> + bool has_rw_option = false;
>
> BlockReopenQueue *brq;
> Error *local_err = NULL;
>
> - while ((c = getopt(argc, argv, "c:o:r")) != -1) {
> + while ((c = getopt(argc, argv, "c:o:rw")) != -1) {
> switch (c) {
> case 'c':
> if (bdrv_parse_cache_mode(optarg, &flags, &writethrough) < 0) {
> @@ -1974,7 +1976,20 @@ static int reopen_f(BlockBackend *blk, int argc, char
> **argv)
> }
> break;
> case 'r':
> + if (has_rw_option) {
> + error_report("Only one -r/-w option may be given");
> + return 0;
> + }
> flags &= ~BDRV_O_RDWR;
> + has_rw_option = true;
> + break;
> + case 'w':
> + if (has_rw_option) {
> + error_report("Only one -r/-w option may be given");
> + return 0;
> + }
> + flags |= BDRV_O_RDWR;
> + has_rw_option = true;
> break;
> default:
> qemu_opts_reset(&reopen_opts);
> --
> 2.13.3
>
>
Reviewed-by: Jeff Cody <address@hidden>
[Qemu-devel] [PATCH for-2.10 1/5] block: Fix order in bdrv_replace_child(), Kevin Wolf, 2017/08/03
[Qemu-devel] [PATCH for-2.10 5/5] qemu-iotests: Test reopen between read-only and read-write, Kevin Wolf, 2017/08/03