Now that we have options grouped, allow the [system] section to be used to set
these options.
Signed-off-by: Anthony Liguori <aligu...@us.ibm.com>
---
vl.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 9 deletions(-)
diff --git a/vl.c b/vl.c
index 9a7ad40..5e86311 100644
--- a/vl.c
+++ b/vl.c
@@ -2187,6 +2187,24 @@ static void qemu_run_machine_init_done_notifiers(void)
notifier_list_notify(&machine_init_done_notifiers, NULL);
}
+static const QEMUOption *find_opt_by_name(const char *name)
+{
+ const QEMUOption *popt;
+
+ popt = qemu_options;
+ for(;;) {
+ if (!popt->name) {
+ break;
+ }
+ if (!strcmp(popt->name, name)) {
+ return popt;
+ }
+ popt++;
+ }
+
+ return NULL;
+}
+
static const QEMUOption *lookup_opt(int argc, char **argv,
const char **poptarg, int *poptind)
{
@@ -2200,15 +2218,10 @@ static const QEMUOption *lookup_opt(int argc, char
**argv,
/* Treat --foo the same as -foo. */
if (r[1] == '-')
r++;
- popt = qemu_options;
- for(;;) {
- if (!popt->name) {
- error_report("invalid option");
- exit(1);
- }
- if (!strcmp(popt->name, r + 1))
- break;
- popt++;
+ popt = find_opt_by_name(r + 1);
+ if (popt == NULL) {
+ error_report("invalid option");
+ exit(1);
}
if (popt->flags & HAS_ARG) {
if (optind >= argc) {
@@ -2273,6 +2286,35 @@ typedef struct QemuOptions
int defconfig;
} QemuOptions;
+static void qemu_parse_option(int index, const char *optarg, QemuOptions
*options);
+
+static int qemu_parse_system_option(const char *name, const char *value, void
*opaque)
+{
+ QemuOptions *options = opaque;
+ const QEMUOption *popt;
+
+ popt = find_opt_by_name(name);
+ if (popt == NULL) {
+ return -1;
+ }
+
+ qemu_parse_option(popt->index, value, options);
+
+ return 0;
+}
+
+static int qemu_parse_system_section(QemuOpts *opts, void *opaque)
+{
+ QemuOptions *options = opaque;
+
+ return qemu_opt_foreach(opts, qemu_parse_system_option, options, 0);
+}
+
+static void qemu_parse_system_sections(QemuOptions *options)
+{
+ qemu_opts_foreach(qemu_find_opts("system"), qemu_parse_system_section,
options, 1);
+}
+
static void qemu_parse_option(int index, const char *optarg, QemuOptions
*options)
{
QemuOpts *opts;
@@ -3143,6 +3185,8 @@ static void qemu_parse_options(int argc, char **argv,
QemuOptions *options)
qemu_parse_option(popt->index, optarg, options);
}
}
+
+ qemu_parse_system_sections(options);
}
int main(int argc, char **argv, char **envp)
--
1.7.5.4
