From: Dustin Kirkland <kirkland@canonical.com> To: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [PATCH] qemu-kvm: fix segfault when running kvm without /dev/kvm, falling back to non-accelerated mode Date: Thu, 3 Sep 2009 12:31:33 -0500 [thread overview] Message-ID: <d9c105ea0909031031g463aa731j846dd73d4c158ebc@mail.gmail.com> (raw) [-- Attachment #1: Type: text/plain, Size: 560 bytes --] qemu-kvm: fix segfault when running kvm without /dev/kvm, falling back to non-accelerated mode We're seeing segfaults on systems without access to /dev/kvm. It looks like the global kvm_allowed is being set just a little too late in vl.c. This patch moves the kvm initialization a bit higher in the vl.c main, just after options processing, and solves the segfaults. We're carrying this patch in Ubuntu 9.10 Alpha. Please apply upstream, or advise if and why this might not be the optimal solution. Signed-off-by: Dustin Kirkland <kirkland@canonical.com> [-- Attachment #2: 04_fix-no-kvm-segfault.patch --] [-- Type: text/x-diff, Size: 1380 bytes --] Move the kvm_init() call a bit higher to fix a segfault when /dev/kvm is not available. The kvm_allowed global needs to be set correctly a little earlier. Signed-off-by: Dustin Kirkland <kirkland@canonical.com> --- qemu-kvm-0.11.0~rc1.orig/vl.c +++ qemu-kvm-0.11.0~rc1/vl.c @@ -5748,6 +5748,20 @@ } } + if (kvm_enabled()) { + int ret; + + ret = kvm_init(smp_cpus); + if (ret < 0) { +#if defined(KVM_UPSTREAM) || defined(NO_CPU_EMULATION) + fprintf(stderr, "failed to initialize KVM\n"); + exit(1); +#endif + fprintf(stderr, "Could not initialize KVM, will disable KVM support\n"); + kvm_allowed = 0; + } + } + /* If no data_dir is specified then try to find it relative to the executable path. */ if (!data_dir) { @@ -6008,20 +6022,6 @@ } } - if (kvm_enabled()) { - int ret; - - ret = kvm_init(smp_cpus); - if (ret < 0) { -#if defined(KVM_UPSTREAM) || defined(NO_CPU_EMULATION) - fprintf(stderr, "failed to initialize KVM\n"); - exit(1); -#endif - fprintf(stderr, "Could not initialize KVM, will disable KVM support\n"); - kvm_allowed = 0; - } - } - if (monitor_device) { monitor_hd = qemu_chr_open("monitor", monitor_device, NULL); if (!monitor_hd) {
WARNING: multiple messages have this Message-ID (diff)
From: Dustin Kirkland <kirkland@canonical.com> To: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH] qemu-kvm: fix segfault when running kvm without /dev/kvm, falling back to non-accelerated mode Date: Thu, 3 Sep 2009 12:31:33 -0500 [thread overview] Message-ID: <d9c105ea0909031031g463aa731j846dd73d4c158ebc@mail.gmail.com> (raw) [-- Attachment #1: Type: text/plain, Size: 560 bytes --] qemu-kvm: fix segfault when running kvm without /dev/kvm, falling back to non-accelerated mode We're seeing segfaults on systems without access to /dev/kvm. It looks like the global kvm_allowed is being set just a little too late in vl.c. This patch moves the kvm initialization a bit higher in the vl.c main, just after options processing, and solves the segfaults. We're carrying this patch in Ubuntu 9.10 Alpha. Please apply upstream, or advise if and why this might not be the optimal solution. Signed-off-by: Dustin Kirkland <kirkland@canonical.com> [-- Attachment #2: 04_fix-no-kvm-segfault.patch --] [-- Type: text/x-diff, Size: 1380 bytes --] Move the kvm_init() call a bit higher to fix a segfault when /dev/kvm is not available. The kvm_allowed global needs to be set correctly a little earlier. Signed-off-by: Dustin Kirkland <kirkland@canonical.com> --- qemu-kvm-0.11.0~rc1.orig/vl.c +++ qemu-kvm-0.11.0~rc1/vl.c @@ -5748,6 +5748,20 @@ } } + if (kvm_enabled()) { + int ret; + + ret = kvm_init(smp_cpus); + if (ret < 0) { +#if defined(KVM_UPSTREAM) || defined(NO_CPU_EMULATION) + fprintf(stderr, "failed to initialize KVM\n"); + exit(1); +#endif + fprintf(stderr, "Could not initialize KVM, will disable KVM support\n"); + kvm_allowed = 0; + } + } + /* If no data_dir is specified then try to find it relative to the executable path. */ if (!data_dir) { @@ -6008,20 +6022,6 @@ } } - if (kvm_enabled()) { - int ret; - - ret = kvm_init(smp_cpus); - if (ret < 0) { -#if defined(KVM_UPSTREAM) || defined(NO_CPU_EMULATION) - fprintf(stderr, "failed to initialize KVM\n"); - exit(1); -#endif - fprintf(stderr, "Could not initialize KVM, will disable KVM support\n"); - kvm_allowed = 0; - } - } - if (monitor_device) { monitor_hd = qemu_chr_open("monitor", monitor_device, NULL); if (!monitor_hd) {
next reply other threads:[~2009-09-03 17:31 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-09-03 17:31 Dustin Kirkland [this message] 2009-09-03 17:31 ` [Qemu-devel] [PATCH] qemu-kvm: fix segfault when running kvm without /dev/kvm, falling back to non-accelerated mode Dustin Kirkland 2009-09-03 19:55 ` Marcelo Tosatti 2009-09-03 19:55 ` [Qemu-devel] " Marcelo Tosatti 2009-09-03 20:01 ` Mark McLoughlin 2009-09-03 20:01 ` [Qemu-devel] " Mark McLoughlin 2009-09-03 21:48 ` Dustin Kirkland 2009-09-03 21:48 ` [Qemu-devel] " Dustin Kirkland 2009-09-03 22:18 ` Glauber Costa 2009-09-03 22:18 ` [Qemu-devel] " Glauber Costa 2009-09-04 7:22 ` Mark McLoughlin 2009-09-04 7:22 ` [Qemu-devel] " Mark McLoughlin 2009-09-04 16:06 ` Dustin Kirkland 2009-09-04 16:06 ` [Qemu-devel] " Dustin Kirkland 2009-09-04 16:36 ` Marcelo Tosatti 2009-09-04 16:36 ` [Qemu-devel] " Marcelo Tosatti 2009-09-04 19:38 ` Dustin Kirkland 2009-09-04 19:38 ` [Qemu-devel] " Dustin Kirkland 2009-09-04 21:39 ` Luiz Capitulino 2009-09-04 21:39 ` Luiz Capitulino 2009-09-04 21:46 ` Marcelo Tosatti 2009-09-04 21:46 ` Marcelo Tosatti 2009-09-04 22:03 ` Luiz Capitulino 2009-09-04 22:03 ` Luiz Capitulino 2009-09-03 20:05 ` Luiz Capitulino 2009-09-03 20:05 ` [Qemu-devel] " Luiz Capitulino
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=d9c105ea0909031031g463aa731j846dd73d4c158ebc@mail.gmail.com \ --to=kirkland@canonical.com \ --cc=kvm@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.