[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/22] machine: package all init arguments into a Qe
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH 04/22] machine: package all init arguments into a QemuOpts (v2) |
Date: |
Mon, 7 Jun 2010 18:51:52 -0500 |
This patch creates a QemuOpts structure and stores all of the machine init
arguments in that structure. It introduces a temporary list of QemuOptDescs
in vl.c such that the current common options can be validated.
The long term vision is that that list becomes a #define and that each machine
can optionally provide it's own QemuOptDescs list using the common options as
a base. This enables per-machine options.
Signed-off-by: Anthony Liguori <address@hidden>
--
v1 -> v2:
- cpu_model -> cpu
diff --git a/hw/pc.c b/hw/pc.c
index 9b85c42..48b3730 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -534,6 +534,10 @@ static void load_linux(void *fw_cfg,
FILE *f;
char *vmode;
+ if (!kernel_cmdline) {
+ kernel_cmdline = "";
+ }
+
/* Align to 16 bytes as a paranoia measure */
cmdline_size = (strlen(kernel_cmdline)+16) & ~15;
diff --git a/qemu-config.c b/qemu-config.c
index 5a4e61b..3679a9f 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -336,6 +336,14 @@ QemuOptsList qemu_cpudef_opts = {
},
};
+QemuOptsList qemu_machine_opts = {
+ .name = "machine",
+ .head = QTAILQ_HEAD_INITIALIZER(qemu_machine_opts.head),
+ .desc = {
+ { /* end of list */ }
+ },
+};
+
static QemuOptsList *vm_config_groups[] = {
&qemu_drive_opts,
&qemu_chardev_opts,
@@ -346,6 +354,7 @@ static QemuOptsList *vm_config_groups[] = {
&qemu_global_opts,
&qemu_mon_opts,
&qemu_cpudef_opts,
+ &qemu_machine_opts,
NULL,
};
diff --git a/qemu-config.h b/qemu-config.h
index dca69d4..6f52188 100644
--- a/qemu-config.h
+++ b/qemu-config.h
@@ -14,6 +14,7 @@ extern QemuOptsList qemu_rtc_opts;
extern QemuOptsList qemu_global_opts;
extern QemuOptsList qemu_mon_opts;
extern QemuOptsList qemu_cpudef_opts;
+extern QemuOptsList qemu_machine_opts;
QemuOptsList *qemu_find_opts(const char *group);
int qemu_set_option(const char *str);
diff --git a/vl.c b/vl.c
index 7121cd0..5349fd5 100644
--- a/vl.c
+++ b/vl.c
@@ -2550,6 +2550,35 @@ static const QEMUOption *lookup_opt(int argc, char
**argv,
return popt;
}
+/* TEMP: until we have proper -machine support */
+static QemuOptDesc common_machine_opts[] = {
+ {
+ .name = "ram_size",
+ .type = QEMU_OPT_SIZE,
+ },
+ {
+ .name = "kernel",
+ .type = QEMU_OPT_STRING,
+ },
+ {
+ .name = "cmdline",
+ .type = QEMU_OPT_STRING,
+ },
+ {
+ .name = "initrd",
+ .type = QEMU_OPT_STRING,
+ },
+ {
+ .name = "boot_device",
+ .type = QEMU_OPT_STRING,
+ },
+ {
+ .name = "cpu",
+ .type = QEMU_OPT_STRING,
+ },
+ { /* end of list */ },
+};
+
int main(int argc, char **argv, char **envp)
{
const char *gdbstub_dev = NULL;
@@ -3718,8 +3747,42 @@ int main(int argc, char **argv, char **envp)
}
qemu_add_globals();
- machine->init(ram_size, boot_devices,
- kernel_filename, kernel_cmdline, initrd_filename, cpu_model);
+ opts = qemu_opts_create(&qemu_machine_opts, NULL, 0);
+ if (kernel_filename) {
+ qemu_opt_set(opts, "kernel", kernel_filename);
+ if (kernel_cmdline) {
+ qemu_opt_set(opts, "cmdline", kernel_cmdline);
+ }
+ if (initrd_filename) {
+ qemu_opt_set(opts, "initrd", initrd_filename);
+ }
+ }
+
+ qemu_opt_set(opts, "boot_device", boot_devices);
+
+ if (cpu_model) {
+ qemu_opt_set(opts, "cpu", cpu_model);
+ }
+
+ if (ram_size) {
+ char buffer[64];
+ snprintf(buffer, sizeof(buffer),
+ "%" PRId64, ram_size);
+ qemu_opt_set(opts, "ram_size", buffer);
+ }
+
+ if (qemu_opts_validate(opts, common_machine_opts) < 0) {
+ exit(1);
+ }
+
+ machine->init(qemu_opt_get_size(opts, "ram_size"),
+ qemu_opt_get(opts, "boot_device"),
+ qemu_opt_get(opts, "kernel"),
+ qemu_opt_get(opts, "cmdline"),
+ qemu_opt_get(opts, "initrd"),
+ qemu_opt_get(opts, "cpu"));
+
+ qemu_opts_del(opts);
cpu_synchronize_all_post_init();
--
1.7.0.4
- [Qemu-devel] Re: [PATCH 01/22] QemuOpts: fix a bug in QemuOpts when setting an option twice, (continued)
- [Qemu-devel] Re: [PATCH 01/22] QemuOpts: fix a bug in QemuOpts when setting an option twice, Paolo Bonzini, 2010/06/08
- Re: [Qemu-devel] Re: [PATCH 01/22] QemuOpts: fix a bug in QemuOpts when setting an option twice, Anthony Liguori, 2010/06/08
- Re: [Qemu-devel] Re: [PATCH 01/22] QemuOpts: fix a bug in QemuOpts when setting an option twice, Gerd Hoffmann, 2010/06/08
- Re: [Qemu-devel] Re: [PATCH 01/22] QemuOpts: fix a bug in QemuOpts when setting an option twice, Anthony Liguori, 2010/06/08
- Re: [Qemu-devel] Re: [PATCH 01/22] QemuOpts: fix a bug in QemuOpts when setting an option twice, Gerd Hoffmann, 2010/06/08
- Re: [Qemu-devel] Re: [PATCH 01/22] QemuOpts: fix a bug in QemuOpts when setting an option twice, Anthony Liguori, 2010/06/08
- Re: [Qemu-devel] Re: [PATCH 01/22] QemuOpts: fix a bug in QemuOpts when setting an option twice, Gerd Hoffmann, 2010/06/09
- Re: [Qemu-devel] Re: [PATCH 01/22] QemuOpts: fix a bug in QemuOpts when setting an option twice, Paul Brook, 2010/06/08
- Re: [Qemu-devel] Re: [PATCH 01/22] QemuOpts: fix a bug in QemuOpts when setting an option twice, Anthony Liguori, 2010/06/08
[Qemu-devel] [PATCH 02/22] QemuOpts: make qemu_opts_validate() store the description list for later use, Anthony Liguori, 2010/06/07
[Qemu-devel] [PATCH 04/22] machine: package all init arguments into a QemuOpts (v2),
Anthony Liguori <=
[Qemu-devel] [PATCH 07/22] machine: introduce -machine option, Anthony Liguori, 2010/06/07
[Qemu-devel] [PATCH 09/22] machine: implement -m in terms of -machine, Anthony Liguori, 2010/06/07
[Qemu-devel] [PATCH 08/22] machine: implement -kernel/-append/-initrd options in term of -machine, Anthony Liguori, 2010/06/07
[Qemu-devel] [PATCH 10/22] machine: allow boards to specify default values and use it in isapc, Anthony Liguori, 2010/06/07
[Qemu-devel] [PATCH 05/22] machine: pass all init options as a single QemuOpts, Anthony Liguori, 2010/06/07
[Qemu-devel] [PATCH 11/22] machine: replace compat_props with opts_default, Anthony Liguori, 2010/06/07