mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vl.c: fix regression when reading machine type from config file

Browse Source 
After 'Machine as QOM' series the machine type input triggers
the creation of the machine class.
If the machine type is set in the configuration file, the machine
class is not updated accordingly and remains the default.

Fixed that by querying the machine options after the configuration
file is loaded.

Cc: qemu-stable@nongnu.org
Reported-by: William Dauchy <william@gandi.net>
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marcel Apfelbaum 2015-01-07 14:11:38 +02:00 committed by Paolo Bonzini
parent e76d442043
commit 364c3e6b8d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vl.c
View File

@ -2796,9 +2796,6 @@ int main(int argc, char **argv, char **envp)
exit(1); exit(1);
} }
switch(popt->index) { switch(popt->index) {
case QEMU_OPTION_M:
machine_class = machine_parse(optarg);
break;
case QEMU_OPTION_no_kvm_irqchip: { case QEMU_OPTION_no_kvm_irqchip: {
olist = qemu_find_opts("machine"); olist = qemu_find_opts("machine");
qemu_opts_parse(olist, "kernel_irqchip=off", 0); qemu_opts_parse(olist, "kernel_irqchip=off", 0);
@ -3420,16 +3417,13 @@ int main(int argc, char **argv, char **envp)
olist = qemu_find_opts("machine"); olist = qemu_find_opts("machine");
qemu_opts_parse(olist, "accel=kvm", 0); qemu_opts_parse(olist, "accel=kvm", 0);
break; break;
case QEMU_OPTION_M:
case QEMU_OPTION_machine: case QEMU_OPTION_machine:
olist = qemu_find_opts("machine"); olist = qemu_find_opts("machine");
opts = qemu_opts_parse(olist, optarg, 1); opts = qemu_opts_parse(olist, optarg, 1);
if (!opts) { if (!opts) {
exit(1); exit(1);
} }
optarg = qemu_opt_get(opts, "type");
if (optarg) {
machine_class = machine_parse(optarg);
}
break; break;
case QEMU_OPTION_no_kvm: case QEMU_OPTION_no_kvm:
olist = qemu_find_opts("machine"); olist = qemu_find_opts("machine");
@ -3752,6 +3746,13 @@ int main(int argc, char **argv, char **envp)
} }
} }
} }
opts = qemu_get_machine_opts();
optarg = qemu_opt_get(opts, "type");
if (optarg) {
machine_class = machine_parse(optarg);
}
loc_set_none(); loc_set_none();
os_daemonize(); os_daemonize();