[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/23] Revert "block: Disable driver-specific option
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 18/23] Revert "block: Disable driver-specific options for 1.5" |
Date: |
Mon, 24 Jun 2013 11:10:30 +0200 |
From: Kevin Wolf <address@hidden>
This reverts commit 8ec7d390b0d50b5e5b4b1d8dba7ba40d64a70875.
Signed-off-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
blockdev.c | 118 ++---------------------------------------------
tests/qemu-iotests/group | 2 +-
2 files changed, 5 insertions(+), 115 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 5975dde..459a87e 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1737,120 +1737,10 @@ QemuOptsList qemu_drive_opts = {
.name = "drive",
.head = QTAILQ_HEAD_INITIALIZER(qemu_drive_opts.head),
.desc = {
- {
- .name = "bus",
- .type = QEMU_OPT_NUMBER,
- .help = "bus number",
- },{
- .name = "unit",
- .type = QEMU_OPT_NUMBER,
- .help = "unit number (i.e. lun for scsi)",
- },{
- .name = "if",
- .type = QEMU_OPT_STRING,
- .help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
- },{
- .name = "index",
- .type = QEMU_OPT_NUMBER,
- .help = "index number",
- },{
- .name = "cyls",
- .type = QEMU_OPT_NUMBER,
- .help = "number of cylinders (ide disk geometry)",
- },{
- .name = "heads",
- .type = QEMU_OPT_NUMBER,
- .help = "number of heads (ide disk geometry)",
- },{
- .name = "secs",
- .type = QEMU_OPT_NUMBER,
- .help = "number of sectors (ide disk geometry)",
- },{
- .name = "trans",
- .type = QEMU_OPT_STRING,
- .help = "chs translation (auto, lba. none)",
- },{
- .name = "media",
- .type = QEMU_OPT_STRING,
- .help = "media type (disk, cdrom)",
- },{
- .name = "snapshot",
- .type = QEMU_OPT_BOOL,
- .help = "enable/disable snapshot mode",
- },{
- .name = "file",
- .type = QEMU_OPT_STRING,
- .help = "disk image",
- },{
- .name = "discard",
- .type = QEMU_OPT_STRING,
- .help = "discard operation (ignore/off, unmap/on)",
- },{
- .name = "cache",
- .type = QEMU_OPT_STRING,
- .help = "host cache usage (none, writeback, writethrough, "
- "directsync, unsafe)",
- },{
- .name = "aio",
- .type = QEMU_OPT_STRING,
- .help = "host AIO implementation (threads, native)",
- },{
- .name = "format",
- .type = QEMU_OPT_STRING,
- .help = "disk format (raw, qcow2, ...)",
- },{
- .name = "serial",
- .type = QEMU_OPT_STRING,
- .help = "disk serial number",
- },{
- .name = "rerror",
- .type = QEMU_OPT_STRING,
- .help = "read error action",
- },{
- .name = "werror",
- .type = QEMU_OPT_STRING,
- .help = "write error action",
- },{
- .name = "addr",
- .type = QEMU_OPT_STRING,
- .help = "pci address (virtio only)",
- },{
- .name = "readonly",
- .type = QEMU_OPT_BOOL,
- .help = "open drive file as read-only",
- },{
- .name = "iops",
- .type = QEMU_OPT_NUMBER,
- .help = "limit total I/O operations per second",
- },{
- .name = "iops_rd",
- .type = QEMU_OPT_NUMBER,
- .help = "limit read operations per second",
- },{
- .name = "iops_wr",
- .type = QEMU_OPT_NUMBER,
- .help = "limit write operations per second",
- },{
- .name = "bps",
- .type = QEMU_OPT_NUMBER,
- .help = "limit total bytes per second",
- },{
- .name = "bps_rd",
- .type = QEMU_OPT_NUMBER,
- .help = "limit read bytes per second",
- },{
- .name = "bps_wr",
- .type = QEMU_OPT_NUMBER,
- .help = "limit write bytes per second",
- },{
- .name = "copy-on-read",
- .type = QEMU_OPT_BOOL,
- .help = "copy read data from backing file into image file",
- },{
- .name = "boot",
- .type = QEMU_OPT_BOOL,
- .help = "(deprecated, ignored)",
- },
+ /*
+ * no elements => accept any params
+ * validation will happen later
+ */
{ /* end of list */ }
},
};
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 387b050..f487a8f 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -57,7 +57,7 @@
048 img auto quick
049 rw auto
050 rw auto backing quick
-#051 rw auto
+051 rw auto
052 rw auto backing
053 rw auto
054 rw auto
--
1.8.1.4
- [Qemu-devel] [PATCH 10/23] ide: Convert CHECK POWER MDOE to ide_cmd_table handler, (continued)
- [Qemu-devel] [PATCH 10/23] ide: Convert CHECK POWER MDOE to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 08/23] ide: Convert DMA read/write commands to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 07/23] ide: Convert PIO read/write commands to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 11/23] ide: Convert SET FEATURES to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 12/23] ide: Convert FLUSH CACHE to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 13/23] ide: Convert SEEK to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 14/23] ide: Convert ATAPI commands to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 15/23] ide: Convert CF-ATA commands to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 16/23] ide: Convert SMART commands to ide_cmd_table handler, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 17/23] ide: Clean up ide_exec_cmd(), Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 18/23] Revert "block: Disable driver-specific options for 1.5",
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 19/23] qcow2: Add refcount update reason to all callers, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 20/23] qcow2: Options to enable discard for freed clusters, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 23/23] vmdk: refuse to open higher version than supported, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 21/23] qcow2: Batch discards, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH 22/23] block: Always enable discard on the protocol level, Stefan Hajnoczi, 2013/06/24