The goal is to get rid of the call to kvm_init. But those things
are subtle, and often break. So do it in a separate patch, to help
finding potential issues in future bisections.
Signed-off-by: Glauber Costa <glom...@redhat.com>
---
vl.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/vl.c b/vl.c
index f4e4d0f..86a6d70 100644
--- a/vl.c
+++ b/vl.c
@@ -5748,15 +5748,6 @@ int main(int argc, char **argv, char **envp)
signal(SIGTTIN, SIG_IGN);
}
-#ifdef CONFIG_KVM
- if (kvm_enabled()) {
- if (kvm_init(smp_cpus) < 0) {
- fprintf(stderr, "Could not initialize KVM, will disable KVM
support\n");
- exit(1);
- }
- }
-#endif
-
if (pid_file && qemu_create_pidfile(pid_file) != 0) {
if (daemonize) {
uint8_t status = 1;
@@ -5956,6 +5947,15 @@ int main(int argc, char **argv, char **envp)
}
#endif
+#ifdef CONFIG_KVM
+ if (kvm_enabled()) {
+ if (kvm_init(smp_cpus) < 0) {
+ fprintf(stderr, "Could not initialize KVM, will disable KVM
support\n");
+ exit(1);
+ }
+ }
+#endif
+
if (monitor_device) {
monitor_hd = qemu_chr_open("monitor", monitor_device, NULL);
if (!monitor_hd) {
--
1.6.2.2
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
