From 90321b7139eb0c078f2dffa2d78a121852389e40 Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Tue, 5 Nov 2013 14:09:04 +0100

Subject: [PATCH 51/87] blockdev: Move parsing of 'media' option to drive_init

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <1383660558-32096-11-git-send-email-kwolf@redhat.com>

Patchwork-id: 55389

O-Subject: [RHEL-7.0 qemu-kvm PATCH 10/24] blockdev: Move parsing of 'media' option to drive_init

Bugzilla: 978402

RH-Acked-by: Fam Zheng <famz@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

This moves as much as possible of the processing of the 'media' option

to drive_init so that it can only be accessed using legacy functions,

but never with anything blockdev-add related.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Benoit Canet <benoit@irqsave.net>

Reviewed-by: Eric Blake <eblake@redhat.com>

(cherry picked from commit 33cb7dc8b7a26ccdff2f054056d3f2e487cbb4cd)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

 blockdev.c | 73 ++++++++++++++++++++++++++++++++++++++++++--------------------

 1 file changed, 50 insertions(+), 23 deletions(-)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 blockdev.c |   73 +++++++++++++++++++++++++++++++++++++++++-------------------

 1 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/blockdev.c b/blockdev.c

index 8dd9fd7..e6d3c15 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -324,16 +324,18 @@ static bool do_check_io_limits(BlockIOLimit *io_limits, Error **errp)

     return true;

 }

+typedef enum { MEDIA_DISK, MEDIA_CDROM } DriveMediaType;

+

 /* Takes the ownership of bs_opts */

 static DriveInfo *blockdev_init(QDict *bs_opts,

-                                BlockInterfaceType block_default_type)

+                                BlockInterfaceType block_default_type,

+                                DriveMediaType media)

 {

     const char *buf;

     const char *file = NULL;

     const char *serial;

     const char *mediastr = "";

     BlockInterfaceType type;

-    enum { MEDIA_DISK, MEDIA_CDROM } media;

     int bus_id, unit_id;

     int cyls, heads, secs, translation;

     int max_devs;

@@ -354,7 +356,6 @@ static DriveInfo *blockdev_init(QDict *bs_opts,

     BlockDriver *drv = NULL;

     translation = BIOS_ATA_TRANSLATION_AUTO;

-    media = MEDIA_DISK;

     /* Check common options by copying from bs_opts to opts, all other options

      * stay in bs_opts for processing by bdrv_open(). */

@@ -441,19 +442,11 @@ static DriveInfo *blockdev_init(QDict *bs_opts,

 	}

     }

-    if ((buf = qemu_opt_get(opts, "media")) != NULL) {

-        if (!strcmp(buf, "disk")) {

-	    media = MEDIA_DISK;

-	} else if (!strcmp(buf, "cdrom")) {

-            if (cyls || secs || heads) {

-                error_report("CHS can't be set with media=%s", buf);

-	        return NULL;

-            }

-	    media = MEDIA_CDROM;

-	} else {

-	    error_report("'%s' invalid media", buf);

-	    return NULL;

-	}

+    if (media == MEDIA_CDROM) {

+        if (cyls || secs || heads) {

+            error_report("CHS can't be set with media=cdrom");

+            return NULL;

+        }

     }

     if ((buf = qemu_opt_get(opts, "discard")) != NULL) {

@@ -752,11 +745,27 @@ static void qemu_opt_rename(QemuOpts *opts, const char *from, const char *to)

     }

 }

+QemuOptsList qemu_legacy_drive_opts = {

+    .name = "drive",

+    .head = QTAILQ_HEAD_INITIALIZER(qemu_legacy_drive_opts.head),

+    .desc = {

+        {

+            .name = "media",

+            .type = QEMU_OPT_STRING,

+            .help = "media type (disk, cdrom)",

+        },

+        { /* end of list */ }

+    },

+};

+

 DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)

 {

     const char *value;

-    DriveInfo *dinfo;

+    DriveInfo *dinfo = NULL;

     QDict *bs_opts;

+    QemuOpts *legacy_opts;

+    DriveMediaType media = MEDIA_DISK;

+    Error *local_err = NULL;

     /* Change legacy command line options into QMP ones */

     qemu_opt_rename(all_opts, "iops", "throttling.iops-total");

@@ -798,8 +807,29 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)

     bs_opts = qdict_new();

     qemu_opts_to_qdict(all_opts, bs_opts);

+    legacy_opts = qemu_opts_create_nofail(&qemu_legacy_drive_opts);

+    qemu_opts_absorb_qdict(legacy_opts, bs_opts, &local_err);

+    if (error_is_set(&local_err)) {

+        qerror_report_err(local_err);

+        error_free(local_err);

+        goto fail;

+    }

+

+    /* Media type */

+    value = qemu_opt_get(legacy_opts, "media");

+    if (value) {

+        if (!strcmp(value, "disk")) {

+            media = MEDIA_DISK;

+        } else if (!strcmp(value, "cdrom")) {

+            media = MEDIA_CDROM;

+        } else {

+            error_report("'%s' invalid media", value);

+            goto fail;

+        }

+    }

+

     /* Actual block device init: Functionality shared with blockdev-add */

-    dinfo = blockdev_init(bs_opts, block_default_type);

+    dinfo = blockdev_init(bs_opts, block_default_type, media);

     if (dinfo == NULL) {

         goto fail;

     }

@@ -809,6 +839,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)

     dinfo->opts = all_opts;

 fail:

+    qemu_opts_del(legacy_opts);

     return dinfo;

 }

@@ -1705,7 +1736,7 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp)

     qdict_flatten(qdict);

-    dinfo = blockdev_init(qdict, IF_NONE);

+    dinfo = blockdev_init(qdict, IF_NONE, MEDIA_DISK);

     if (!dinfo) {

         error_setg(errp, "Could not open image");

         goto fail;

@@ -1774,10 +1805,6 @@ QemuOptsList qemu_common_drive_opts = {

             .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",

-- 

1.7.1