Commit 492fdc6f authored by Kevin Wolf's avatar Kevin Wolf Committed by Stefan Hajnoczi
Browse files

Revert "block: Disable driver-specific options for 1.5" 



This reverts commit 8ec7d390.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent dfe1ea8f

blockdev.c

+4 −114
Original line number Diff line number Diff line
@@ -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 */ }

    },

};

tests/qemu-iotests/group

+1 −1
Original line number Diff line number Diff line
@@ -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