|
 |
9ae3a8 |
From f093ad3c94cae221641ea0dd13ec3cf666a0fccd Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 19 Jul 2013 20:07:29 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 30/38] blockdev: Rename 'readonly' option to 'read-only'
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1378736903-18489-31-git-send-email-kwolf@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 54217
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 30/32] blockdev: Rename 'readonly' option to 'read-only'
|
|
|
9ae3a8 |
Bugzilla: 1005818
|
|
|
9ae3a8 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: 1005818
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Option name cleanup before it becomes a QMP API.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 0f227a947004aa9043d4386f4a47d6739499b88f)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
blockdev.c | 10 ++++++----
|
|
|
9ae3a8 |
tests/qemu-iotests/051.out | 2 +-
|
|
|
9ae3a8 |
2 files changed, 7 insertions(+), 5 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/blockdev.c b/blockdev.c
|
|
|
9ae3a8 |
index 08b1aaf..5d4f2f8 100644
|
|
|
9ae3a8 |
--- a/blockdev.c
|
|
|
9ae3a8 |
+++ b/blockdev.c
|
|
|
9ae3a8 |
@@ -378,7 +378,7 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts,
|
|
|
9ae3a8 |
secs = qemu_opt_get_number(opts, "secs", 0);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
snapshot = qemu_opt_get_bool(opts, "snapshot", 0);
|
|
|
9ae3a8 |
- ro = qemu_opt_get_bool(opts, "readonly", 0);
|
|
|
9ae3a8 |
+ ro = qemu_opt_get_bool(opts, "read-only", 0);
|
|
|
9ae3a8 |
copy_on_read = qemu_opt_get_bool(opts, "copy-on-read", false);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
file = qemu_opt_get(opts, "file");
|
|
|
9ae3a8 |
@@ -684,7 +684,7 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts,
|
|
|
9ae3a8 |
} else if (ro == 1) {
|
|
|
9ae3a8 |
if (type != IF_SCSI && type != IF_VIRTIO && type != IF_FLOPPY &&
|
|
|
9ae3a8 |
type != IF_NONE && type != IF_PFLASH) {
|
|
|
9ae3a8 |
- error_report("readonly not supported by this bus type");
|
|
|
9ae3a8 |
+ error_report("read-only not supported by this bus type");
|
|
|
9ae3a8 |
goto err;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
@@ -692,7 +692,7 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts,
|
|
|
9ae3a8 |
bdrv_flags |= ro ? 0 : BDRV_O_RDWR;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
if (ro && copy_on_read) {
|
|
|
9ae3a8 |
- error_report("warning: disabling copy_on_read on readonly drive");
|
|
|
9ae3a8 |
+ error_report("warning: disabling copy_on_read on read-only drive");
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
QINCREF(bs_opts);
|
|
|
9ae3a8 |
@@ -749,6 +749,8 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
|
|
|
9ae3a8 |
qemu_opt_rename(all_opts, "bps_rd", "throttling.bps-read");
|
|
|
9ae3a8 |
qemu_opt_rename(all_opts, "bps_wr", "throttling.bps-write");
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+ qemu_opt_rename(all_opts, "readonly", "read-only");
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
return blockdev_init(all_opts, block_default_type);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -1701,7 +1703,7 @@ QemuOptsList qemu_common_drive_opts = {
|
|
|
9ae3a8 |
.type = QEMU_OPT_STRING,
|
|
|
9ae3a8 |
.help = "pci address (virtio only)",
|
|
|
9ae3a8 |
},{
|
|
|
9ae3a8 |
- .name = "readonly",
|
|
|
9ae3a8 |
+ .name = "read-only",
|
|
|
9ae3a8 |
.type = QEMU_OPT_BOOL,
|
|
|
9ae3a8 |
.help = "open drive file as read-only",
|
|
|
9ae3a8 |
},{
|
|
|
9ae3a8 |
diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
|
|
|
9ae3a8 |
index 95ff245..8630382 100644
|
|
|
9ae3a8 |
--- a/tests/qemu-iotests/051.out
|
|
|
9ae3a8 |
+++ b/tests/qemu-iotests/051.out
|
|
|
9ae3a8 |
@@ -137,7 +137,7 @@ QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
9ae3a8 |
(qemu) q?[K?[Dqu?[K?[D?[Dqui?[K?[D?[D?[Dquit?[K
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
|
|
|
9ae3a8 |
-QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on: readonly not supported by this bus type
|
|
|
9ae3a8 |
+QEMU_PROG: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on: read-only not supported by this bus type
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
|
|
|
9ae3a8 |
QEMU 1.5.50 monitor - type 'help' for more information
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|