mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-11-05 20:35:44 +00:00
handle device help before accelerator set up
A command line device probe using just -device "?" gets processed after qemu-kvm initializes the accelerator. If /dev/kvm is not present, the accelerator check will fail (kvm is defaulted to on), which causes libvirt to not be set up to handle qemu guests. Moving the device help handling before the accelerator set up allows the device probe to work in this configuration and libvirt succeeds in setting up for a qemu hypervisor mode. Signed-off-by: Bruce Rogers <brogers@suse.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
parent
d3da41e32b
commit
3d1d965297
1 changed files with 5 additions and 3 deletions
8
vl.c
8
vl.c
|
@ -3345,6 +3345,11 @@ int main(int argc, char **argv, char **envp)
|
|||
ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
|
||||
}
|
||||
|
||||
if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, NULL, 0)
|
||||
!= 0) {
|
||||
exit(0);
|
||||
}
|
||||
|
||||
configure_accelerator();
|
||||
|
||||
qemu_init_cpu_loop();
|
||||
|
@ -3500,9 +3505,6 @@ int main(int argc, char **argv, char **envp)
|
|||
}
|
||||
select_vgahw(vga_model);
|
||||
|
||||
if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, NULL, 0) != 0)
|
||||
exit(0);
|
||||
|
||||
if (watchdog) {
|
||||
i = select_watchdog(watchdog);
|
||||
if (i > 0)
|
||||
|
|
Loading…
Reference in a new issue