block: Disable driver-specific options for 1.5
PATCH 1/1 block: Disable driver-specific options for 1.5
We don't want to commit to the API yet before everything is worked out. Disable it for the 1.5 release. This commit is meant to be reverted after the 1.5 release.
The disabling of the driver-specific options is achieved by applying the old checks while parsing the command line.
--- blockdev.c | 118 +++++++++++++++++++++++++++++++++++++++++++++-- tests/qemu-iotests/group | 2 +- 2 files changed, 115 insertions(+), 5 deletions(-)
blockdev.c +114 -4
@@ -1656,10 +1656,120 @@ QemuOptsList qemu_drive_opts = { .name = "drive", .head = QTAILQ_HEAD_INITIALIZER(qemu_drive_opts.head), .desc = { -/* -* no elements => accept any params -* validation will happen later -*/ + { + .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)", + }, { /* end of list */ } }, };
tests/qemu-iotests/group +1 -1
@@ -57,6 +57,6 @@ 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
Signature · 1 line
1.8.1.4
Quoted 3 lines · Kevin Wolf
We don't want to commit to the API yet before everything is worked out. Disable it for the 1.5 release. This commit is meant to be reverted after the 1.5 release.
Agreed that command line support without QMP support is awkward, so crippling the code until we have full support in 1.6 is perfectly fine for libvirt's perspective.
Quoted 9 lines
The disabling of the driver-specific options is achieved by applying the old checks while parsing the command line.
Signed-off-by Kevin Wolf <[email protected]>--- blockdev.c | 118 +++++++++++++++++++++++++++++++++++++++++++++-- tests/qemu-iotests/group | 2 +- 2 files changed, 115 insertions(+), 5 deletions(-)
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Stefan Hajnoczi
AppliedQuoted 4 lines · Kevin Wolf
We don't want to commit to the API yet before everything is worked out. Disable it for the 1.5 release. This commit is meant to be reverted after the 1.5 release.
Quoted 8 lines
The disabling of the driver-specific options is achieved by applying the old checks while parsing the command line.
Signed-off-by Kevin Wolf <[email protected]>--- blockdev.c | 118 +++++++++++++++++++++++++++++++++++++++++++++-- tests/qemu-iotests/group | 2 +- 2 files changed, 115 insertions(+), 5 deletions(-)
I was wondering why you merged the original patches already, this explains it :).
Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block
Stefan
Am 24.04.2013 um 16:58 hat Stefan Hajnoczi geschrieben:
Quoted 8 lines · Kevin Wolf
Quoted 7 lines
We don't want to commit to the API yet before everything is worked out. Disable it for the 1.5 release. This commit is meant to be reverted after the 1.5 release.
The disabling of the driver-specific options is achieved by applying the old checks while parsing the command line.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Kevin Wolf <[email protected]>--- blockdev.c | 118 +++++++++++++++++++++++++++++++++++++++++++++-- tests/qemu-iotests/group | 2 +- 2 files changed, 115 insertions(+), 5 deletions(-)I was wondering why you merged the original patches already, this explains it :).
The original patches came in three or four series, the first of which was merged about a month ago. So it didn't make sense to hold back just the last one as the basics were already in.
Kevin