From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2oVZ-0001Yd-WA for qemu-devel@nongnu.org; Fri, 26 Jul 2013 16:21:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2oVY-0007sq-QA for qemu-devel@nongnu.org; Fri, 26 Jul 2013 16:21:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55615) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2oVY-0007si-5v for qemu-devel@nongnu.org; Fri, 26 Jul 2013 16:21:00 -0400 From: Kevin Wolf Date: Fri, 26 Jul 2013 22:20:28 +0200 Message-Id: <1374870032-31672-15-git-send-email-kwolf@redhat.com> In-Reply-To: <1374870032-31672-1-git-send-email-kwolf@redhat.com> References: <1374870032-31672-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 14/18] blockdev: Rename 'readonly' option to 'read-only' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org Option name cleanup before it becomes a QMP API. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- blockdev.c | 10 ++++++---- tests/qemu-iotests/051.out | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/blockdev.c b/blockdev.c index 5403188..3b05e29 100644 --- a/blockdev.c +++ b/blockdev.c @@ -378,7 +378,7 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts, secs = qemu_opt_get_number(opts, "secs", 0); snapshot = qemu_opt_get_bool(opts, "snapshot", 0); - ro = qemu_opt_get_bool(opts, "readonly", 0); + ro = qemu_opt_get_bool(opts, "read-only", 0); copy_on_read = qemu_opt_get_bool(opts, "copy-on-read", false); file = qemu_opt_get(opts, "file"); @@ -684,7 +684,7 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts, } else if (ro == 1) { if (type != IF_SCSI && type != IF_VIRTIO && type != IF_FLOPPY && type != IF_NONE && type != IF_PFLASH) { - error_report("readonly not supported by this bus type"); + error_report("read-only not supported by this bus type"); goto err; } } @@ -692,7 +692,7 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts, bdrv_flags |= ro ? 0 : BDRV_O_RDWR; if (ro && copy_on_read) { - error_report("warning: disabling copy_on_read on readonly drive"); + error_report("warning: disabling copy_on_read on read-only drive"); } QINCREF(bs_opts); @@ -749,6 +749,8 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) qemu_opt_rename(all_opts, "bps_rd", "throttling.bps-read"); qemu_opt_rename(all_opts, "bps_wr", "throttling.bps-write"); + qemu_opt_rename(all_opts, "readonly", "read-only"); + return blockdev_init(all_opts, block_default_type); } @@ -1877,7 +1879,7 @@ QemuOptsList qemu_common_drive_opts = { .type = QEMU_OPT_STRING, .help = "pci address (virtio only)", },{ - .name = "readonly", + .name = "read-only", .type = QEMU_OPT_BOOL, .help = "open drive file as read-only", },{ diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out index c676538..9588d0c 100644 --- a/tests/qemu-iotests/051.out +++ b/tests/qemu-iotests/051.out @@ -137,7 +137,7 @@ QEMU 1.5.50 monitor - type 'help' for more information (qemu) qququiquit Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on -QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on: readonly not supported by this bus type +QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on: read-only not supported by this bus type Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on QEMU 1.5.50 monitor - type 'help' for more information -- 1.8.1.4