From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzXng-0002AL-VD for qemu-devel@nongnu.org; Thu, 09 Aug 2012 14:49:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SzXng-0001i9-3H for qemu-devel@nongnu.org; Thu, 09 Aug 2012 14:49:40 -0400 Received: from 63-248-41-43.static.orml012.digis.net ([63.248.41.43]:52854 helo=suse.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzXnf-0001WB-TQ for qemu-devel@nongnu.org; Thu, 09 Aug 2012 14:49:40 -0400 From: Bruce Rogers Date: Thu, 9 Aug 2012 12:47:40 -0600 Message-Id: <1344538060-25948-1-git-send-email-brogers@suse.com> Subject: [Qemu-devel] [PATCH v2] handle device help before accelerator set up List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Bruce Rogers 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 --- vl.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index e71cb30..a4a520f 100644 --- a/vl.c +++ b/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) -- 1.7.7