|
 |
9ae3a8 |
From 2f216971132c8fd7a6b05af6efa8103b9459b7f5 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 9 Sep 2013 14:27:59 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 08/38] Revert "block: Disable driver-specific options for 1.5"
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1378736903-18489-9-git-send-email-kwolf@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 54197
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 08/32] Revert "block: Disable driver-specific options for 1.5"
|
|
|
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 |
This reverts commit 8ec7d390b0d50b5e5b4b1d8dba7ba40d64a70875.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 492fdc6fbe17b2d45878e813e980f782ac260c30)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
blockdev.c | 118 ++---------------------------------------------
|
|
|
9ae3a8 |
tests/qemu-iotests/group | 2 +-
|
|
|
9ae3a8 |
2 files changed, 5 insertions(+), 115 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
blockdev.c | 118 ++--------------------------------------------
|
|
|
9ae3a8 |
tests/qemu-iotests/group | 2 +-
|
|
|
9ae3a8 |
2 files changed, 5 insertions(+), 115 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/blockdev.c b/blockdev.c
|
|
|
9ae3a8 |
index 1f405c9..bd33c17 100644
|
|
|
9ae3a8 |
--- a/blockdev.c
|
|
|
9ae3a8 |
+++ b/blockdev.c
|
|
|
9ae3a8 |
@@ -1719,120 +1719,10 @@ QemuOptsList qemu_drive_opts = {
|
|
|
9ae3a8 |
.name = "drive",
|
|
|
9ae3a8 |
.head = QTAILQ_HEAD_INITIALIZER(qemu_drive_opts.head),
|
|
|
9ae3a8 |
.desc = {
|
|
|
9ae3a8 |
- {
|
|
|
9ae3a8 |
- .name = "bus",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_NUMBER,
|
|
|
9ae3a8 |
- .help = "bus number",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "unit",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_NUMBER,
|
|
|
9ae3a8 |
- .help = "unit number (i.e. lun for scsi)",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "if",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_STRING,
|
|
|
9ae3a8 |
- .help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "index",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_NUMBER,
|
|
|
9ae3a8 |
- .help = "index number",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "cyls",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_NUMBER,
|
|
|
9ae3a8 |
- .help = "number of cylinders (ide disk geometry)",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "heads",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_NUMBER,
|
|
|
9ae3a8 |
- .help = "number of heads (ide disk geometry)",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "secs",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_NUMBER,
|
|
|
9ae3a8 |
- .help = "number of sectors (ide disk geometry)",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "trans",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_STRING,
|
|
|
9ae3a8 |
- .help = "chs translation (auto, lba. none)",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "media",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_STRING,
|
|
|
9ae3a8 |
- .help = "media type (disk, cdrom)",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "snapshot",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_BOOL,
|
|
|
9ae3a8 |
- .help = "enable/disable snapshot mode",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "file",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_STRING,
|
|
|
9ae3a8 |
- .help = "disk image",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "discard",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_STRING,
|
|
|
9ae3a8 |
- .help = "discard operation (ignore/off, unmap/on)",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "cache",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_STRING,
|
|
|
9ae3a8 |
- .help = "host cache usage (none, writeback, writethrough, "
|
|
|
9ae3a8 |
- "directsync, unsafe)",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "aio",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_STRING,
|
|
|
9ae3a8 |
- .help = "host AIO implementation (threads, native)",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "format",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_STRING,
|
|
|
9ae3a8 |
- .help = "disk format (raw, qcow2, ...)",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "serial",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_STRING,
|
|
|
9ae3a8 |
- .help = "disk serial number",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "rerror",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_STRING,
|
|
|
9ae3a8 |
- .help = "read error action",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "werror",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_STRING,
|
|
|
9ae3a8 |
- .help = "write error action",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "addr",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_STRING,
|
|
|
9ae3a8 |
- .help = "pci address (virtio only)",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "readonly",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_BOOL,
|
|
|
9ae3a8 |
- .help = "open drive file as read-only",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "iops",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_NUMBER,
|
|
|
9ae3a8 |
- .help = "limit total I/O operations per second",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "iops_rd",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_NUMBER,
|
|
|
9ae3a8 |
- .help = "limit read operations per second",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "iops_wr",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_NUMBER,
|
|
|
9ae3a8 |
- .help = "limit write operations per second",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "bps",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_NUMBER,
|
|
|
9ae3a8 |
- .help = "limit total bytes per second",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "bps_rd",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_NUMBER,
|
|
|
9ae3a8 |
- .help = "limit read bytes per second",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "bps_wr",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_NUMBER,
|
|
|
9ae3a8 |
- .help = "limit write bytes per second",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "copy-on-read",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_BOOL,
|
|
|
9ae3a8 |
- .help = "copy read data from backing file into image file",
|
|
|
9ae3a8 |
- },{
|
|
|
9ae3a8 |
- .name = "boot",
|
|
|
9ae3a8 |
- .type = QEMU_OPT_BOOL,
|
|
|
9ae3a8 |
- .help = "(deprecated, ignored)",
|
|
|
9ae3a8 |
- },
|
|
|
9ae3a8 |
+ /*
|
|
|
9ae3a8 |
+ * no elements => accept any params
|
|
|
9ae3a8 |
+ * validation will happen later
|
|
|
9ae3a8 |
+ */
|
|
|
9ae3a8 |
{ /* end of list */ }
|
|
|
9ae3a8 |
},
|
|
|
9ae3a8 |
};
|
|
|
9ae3a8 |
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
|
|
|
9ae3a8 |
index bf944d9..68eabda 100644
|
|
|
9ae3a8 |
--- a/tests/qemu-iotests/group
|
|
|
9ae3a8 |
+++ b/tests/qemu-iotests/group
|
|
|
9ae3a8 |
@@ -57,6 +57,6 @@
|
|
|
9ae3a8 |
048 img auto quick
|
|
|
9ae3a8 |
049 rw auto
|
|
|
9ae3a8 |
050 rw auto backing quick
|
|
|
9ae3a8 |
-#051 rw auto
|
|
|
9ae3a8 |
+051 rw auto
|
|
|
9ae3a8 |
052 rw auto backing
|
|
|
9ae3a8 |
053 rw auto
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|