Patchwork [1/2] vl: rewamp -boot options parsing

login
register
mail settings
Submitter Michael Tokarev
Date June 19, 2013, 5:16 p.m.
Message ID <1371662183-29138-1-git-send-email-mjt@msgid.tls.msk.ru>
Download mbox | patch
Permalink /patch/252626/
State New
Headers show

Comments

Michael Tokarev - June 19, 2013, 5:16 p.m.
This rewrites -boot option parsing to use qemu_opts_parse()
with its current validation and abbreviation abilities.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 vl.c |   91 ++++++++++++++++--------------------------------------------------
 1 file changed, 21 insertions(+), 70 deletions(-)

Patch

diff --git a/vl.c b/vl.c
index f94ec9c..32b1434 100644
--- a/vl.c
+++ b/vl.c
@@ -434,9 +434,9 @@  static QemuOptsList qemu_machine_opts = {
 
 static QemuOptsList qemu_boot_opts = {
     .name = "boot-opts",
+    .implied_opt_name = "order",
     .head = QTAILQ_HEAD_INITIALIZER(qemu_boot_opts.head),
     .desc = {
-        /* the three names below are not used now */
         {
             .name = "order",
             .type = QEMU_OPT_STRING,
@@ -445,8 +445,7 @@  static QemuOptsList qemu_boot_opts = {
             .type = QEMU_OPT_STRING,
         }, {
             .name = "menu",
-            .type = QEMU_OPT_STRING,
-        /* following are really used */
+            .type = QEMU_OPT_BOOL,
         }, {
             .name = "splash",
             .type = QEMU_OPT_STRING,
@@ -458,7 +457,7 @@  static QemuOptsList qemu_boot_opts = {
             .type = QEMU_OPT_STRING,
         }, {
             .name = "strict",
-            .type = QEMU_OPT_STRING,
+            .type = QEMU_OPT_BOOL,
         },
         { /*End of list */ }
     },
@@ -1157,7 +1156,7 @@  int qemu_boot_set(const char *boot_devices)
     return boot_set_handler(boot_set_opaque, boot_devices);
 }
 
-static void validate_bootdevices(char *devices)
+static void validate_bootdevices(const char *devices)
 {
     /* We just do some generic consistency checks */
     const char *p;
@@ -3131,71 +3130,23 @@  int main(int argc, char **argv, char **envp)
                 drive_add(IF_DEFAULT, 2, optarg, CDROM_OPTS);
                 break;
             case QEMU_OPTION_boot:
-                {
-                    static const char * const params[] = {
-                        "order", "once", "menu",
-                        "splash", "splash-time",
-                        "reboot-timeout", "strict", NULL
-                    };
-                    char buf[sizeof(boot_devices)];
-                    char *standard_boot_devices;
-                    int legacy = 0;
-
-                    if (!strchr(optarg, '=')) {
-                        legacy = 1;
-                        pstrcpy(buf, sizeof(buf), optarg);
-                    } else if (check_params(buf, sizeof(buf), params, optarg) < 0) {
-                        fprintf(stderr,
-                                "qemu: unknown boot parameter '%s' in '%s'\n",
-                                buf, optarg);
-                        exit(1);
-                    }
-
-                    if (legacy ||
-                        get_param_value(buf, sizeof(buf), "order", optarg)) {
-                        validate_bootdevices(buf);
-                        pstrcpy(boot_devices, sizeof(boot_devices), buf);
-                    }
-                    if (!legacy) {
-                        if (get_param_value(buf, sizeof(buf),
-                                            "once", optarg)) {
-                            validate_bootdevices(buf);
-                            standard_boot_devices = g_strdup(boot_devices);
-                            pstrcpy(boot_devices, sizeof(boot_devices), buf);
-                            qemu_register_reset(restore_boot_devices,
-                                                standard_boot_devices);
-                        }
-                        if (get_param_value(buf, sizeof(buf),
-                                            "menu", optarg)) {
-                            if (!strcmp(buf, "on")) {
-                                boot_menu = 1;
-                            } else if (!strcmp(buf, "off")) {
-                                boot_menu = 0;
-                            } else {
-                                fprintf(stderr,
-                                        "qemu: invalid option value '%s'\n",
-                                        buf);
-                                exit(1);
-                            }
-                        }
-                        if (get_param_value(buf, sizeof(buf),
-                                            "strict", optarg)) {
-                            if (!strcmp(buf, "on")) {
-                                boot_strict = true;
-                            } else if (!strcmp(buf, "off")) {
-                                boot_strict = false;
-                            } else {
-                                fprintf(stderr,
-                                        "qemu: invalid option value '%s'\n",
-                                        buf);
-                                exit(1);
-                            }
-                        }
-                        if (!qemu_opts_parse(qemu_find_opts("boot-opts"),
-                                             optarg, 0)) {
-                            exit(1);
-                        }
-                    }
+                opts = qemu_opts_parse(qemu_find_opts("boot-opts"), optarg, 1);
+                if (!opts) {
+                    exit(1);
+                }
+                boot_menu = qemu_opt_get_bool(opts, "menu", false);
+                boot_strict = qemu_opt_get_bool(opts, "strict", false);
+                optarg = qemu_opt_get(opts, "order");
+                if (optarg) {
+                    validate_bootdevices(optarg);
+                    pstrcpy(boot_devices, sizeof(boot_devices), optarg);
+                }
+                optarg = qemu_opt_get(opts, "once");
+                if (optarg) {
+                    validate_bootdevices(optarg);
+                    qemu_register_reset(restore_boot_devices,
+                                        g_strdup(boot_devices));
+                    pstrcpy(boot_devices, sizeof(boot_devices), optarg);
                 }
                 break;
             case QEMU_OPTION_fda: