diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2013-07-19 20:07:29 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2013-07-26 22:01:02 +0200 |
| commit | 0f227a947004aa9043d4386f4a47d6739499b88f (patch) | |
| tree | cc59d7db396d106a260dfa884d79d9416dcbf053 | |
| parent | 64aa99d3e0333dea73d7505190659a02ca909292 (diff) | |
blockdev: Rename 'readonly' option to 'read-only'
Option name cleanup before it becomes a QMP API.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | blockdev.c | 10 | ||||
| -rw-r--r-- | tests/qemu-iotests/051.out | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/blockdev.c b/blockdev.c index 5403188005..3b05e29082 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 c676538022..9588d0c977 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) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K
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
|