yeahuh / rpms / qemu-kvm

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