[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/15] vl.c: fix regression when reading machine type
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 02/15] vl.c: fix regression when reading machine type from config file |
Date: |
Wed, 14 Jan 2015 10:41:19 +0100 |
From: Marcel Apfelbaum <address@hidden>
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: address@hidden
Reported-by: William Dauchy <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
vl.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/vl.c b/vl.c
index 7786b2f..1a2da2b 100644
--- a/vl.c
+++ b/vl.c
@@ -2796,9 +2796,6 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
switch(popt->index) {
- case QEMU_OPTION_M:
- machine_class = machine_parse(optarg);
- break;
case QEMU_OPTION_no_kvm_irqchip: {
olist = qemu_find_opts("machine");
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");
qemu_opts_parse(olist, "accel=kvm", 0);
break;
+ case QEMU_OPTION_M:
case QEMU_OPTION_machine:
olist = qemu_find_opts("machine");
opts = qemu_opts_parse(olist, optarg, 1);
if (!opts) {
exit(1);
}
- optarg = qemu_opt_get(opts, "type");
- if (optarg) {
- machine_class = machine_parse(optarg);
- }
break;
case QEMU_OPTION_no_kvm:
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();
os_daemonize();
--
1.8.3.1
- [Qemu-devel] [PULL 00/15] Misc patches for 2015-01-14, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 02/15] vl.c: fix regression when reading machine type from config file,
Paolo Bonzini <=
- [Qemu-devel] [PULL 03/15] 9pfs: changed to use event_notifier instead of qemu_pipe, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 05/15] vl: fix max_cpus check, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 08/15] target-i386: fix movntsd on big-endian hosts, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 07/15] vl.c: fix regression when reading memory size from config file, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 04/15] vl: Avoid unnecessary 'if' nesting, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 01/15] char: restore stdio echo on resume from suspend., Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 09/15] target-i386: do not memcpy in and out of xmm_regs, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 10/15] qemu-common.h: optimise muldiv64 if int128 is available, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 14/15] qemu-timer: rename timer_init to timer_init_tl, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 15/15] cpus: consistently use QEMU_CLOCK_VIRTUAL_RT for icount_warp_rt timer, Paolo Bonzini, 2015/01/14