aboutsummaryrefslogtreecommitdiff
path: root/qemu-config.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2011-07-23 12:38:37 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2011-07-23 10:19:49 -0500
commit9052ea6bf4962b1342aa56d4341bb55176ed9e45 (patch)
treedb62acb0a55260c3f6263e34d066b1fe416ebbf1 /qemu-config.c
parent7006b9cff356233c3db0150ec55fd999c49dfae3 (diff)
downloadqemu-9052ea6bf4962b1342aa56d4341bb55176ed9e45.zip
qemu-9052ea6bf4962b1342aa56d4341bb55176ed9e45.tar.gz
qemu-9052ea6bf4962b1342aa56d4341bb55176ed9e45.tar.bz2
Generalize -machine command line option
-machine somehow suggests that it selects the machine, but it doesn't. Fix that before this command is set in stone. Actually, -machine should supersede -M and allow to introduce arbitrary per-machine options to the command line. That will change the internal realization again, but we will be able to keep the user interface stable. Tested-by: Ian Campbell <ian.campbell@citrix.com> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-config.c')
-rw-r--r--qemu-config.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/qemu-config.c b/qemu-config.c
index 93d20c6..b2ec40b 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -464,9 +464,14 @@ QemuOptsList qemu_option_rom_opts = {
static QemuOptsList qemu_machine_opts = {
.name = "machine",
+ .implied_opt_name = "type",
.head = QTAILQ_HEAD_INITIALIZER(qemu_machine_opts.head),
.desc = {
{
+ .name = "type",
+ .type = QEMU_OPT_STRING,
+ .help = "emulated machine"
+ }, {
.name = "accel",
.type = QEMU_OPT_STRING,
.help = "accelerator list",