Patchwork drive: allow rerror, werror and readonly for if=none

login
register
mail settings
Submitter Gerd Hoffmann
Date May 26, 2010, 8:44 a.m.
Message ID <1274863484-15147-1-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/53598/
State New
Headers show

Comments

Gerd Hoffmann - May 26, 2010, 8:44 a.m.
When creating guest disks the qdev way using ...

  -drive if=none,id=$name,args
  -device $driver,drive=$name

it is not possible to specify rerror, werror and readonly arguments
for drive as drive_init allows/blocks them based on the interface (if=)
specified and none isn't white-listed there.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 vl.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Kevin Wolf - May 26, 2010, 9:53 a.m.
Am 26.05.2010 10:44, schrieb Gerd Hoffmann:
> When creating guest disks the qdev way using ...
> 
>   -drive if=none,id=$name,args
>   -device $driver,drive=$name
> 
> it is not possible to specify rerror, werror and readonly arguments
> for drive as drive_init allows/blocks them based on the interface (if=)
> specified and none isn't white-listed there.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/vl.c b/vl.c
index 328395e..71346ac 100644
--- a/vl.c
+++ b/vl.c
@@ -950,7 +950,7 @@  DriveInfo *drive_init(QemuOpts *opts, void *opaque,
 
     on_write_error = BLOCK_ERR_STOP_ENOSPC;
     if ((buf = qemu_opt_get(opts, "werror")) != NULL) {
-        if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO) {
+        if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && type != IF_NONE) {
             fprintf(stderr, "werror is no supported by this format\n");
             return NULL;
         }
@@ -963,7 +963,7 @@  DriveInfo *drive_init(QemuOpts *opts, void *opaque,
 
     on_read_error = BLOCK_ERR_REPORT;
     if ((buf = qemu_opt_get(opts, "rerror")) != NULL) {
-        if (type != IF_IDE && type != IF_VIRTIO) {
+        if (type != IF_IDE && type != IF_VIRTIO && type != IF_NONE) {
             fprintf(stderr, "rerror is no supported by this format\n");
             return NULL;
         }
@@ -1111,7 +1111,7 @@  DriveInfo *drive_init(QemuOpts *opts, void *opaque,
         /* CDROM is fine for any interface, don't check.  */
         ro = 1;
     } else if (ro == 1) {
-        if (type != IF_SCSI && type != IF_VIRTIO && type != IF_FLOPPY) {
+        if (type != IF_SCSI && type != IF_VIRTIO && type != IF_FLOPPY && type != IF_NONE) {
             fprintf(stderr, "qemu: readonly flag not supported for drive with this interface\n");
             return NULL;
         }