aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDustin Kirkland <kirkland@canonical.com>2009-09-03 12:31:33 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2009-09-09 17:31:27 -0500
commite09a5267adf0af25b55d2abaf06e288b2d9537ea (patch)
tree8ce754da5f4a34a8873eddae54824b9894e29b01
parent3cfcae3cda7da23dc2e99671021ad752f398c4c4 (diff)
qemu-kvm: fix segfault when running kvm without /dev/kvm, falling back to non-accelerated mode
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> 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> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--vl.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/vl.c b/vl.c
index 12b19bce9c..8e5d9db3e2 100644
--- a/vl.c
+++ b/vl.c
@@ -5559,6 +5559,16 @@ int main(int argc, char **argv, char **envp)
}
}
+ if (kvm_enabled()) {
+ int ret;
+
+ ret = kvm_init(smp_cpus);
+ if (ret < 0) {
+ fprintf(stderr, "failed to initialize KVM\n");
+ exit(1);
+ }
+ }
+
/* If no data_dir is specified then try to find it relative to the
executable path. */
if (!data_dir) {
@@ -5793,16 +5803,6 @@ int main(int argc, char **argv, char **envp)
}
}
- if (kvm_enabled()) {
- int ret;
-
- ret = kvm_init(smp_cpus);
- if (ret < 0) {
- fprintf(stderr, "failed to initialize KVM\n");
- exit(1);
- }
- }
-
for (i = 0; i < MAX_MONITOR_DEVICES; i++) {
const char *devname = monitor_devices[i];
if (devname && strcmp(devname, "none")) {