[Qemu-devel] [PATCH 4/7] Move KVM and Xen global flags to vl.c

[Blue Swirl]

Signed-off-by: Blue Swirl <address@hidden>
---
 hw/xen_machine_pv.c |    3 ---
 kvm-all.c           |    2 --
 vl.c                |    4 ++++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 162f88d..586214d 100644
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -29,9 +29,6 @@
 #include "xen_backend.h"
 #include "xen_domainbuild.h"

-uint32_t xen_domid;
-enum xen_mode xen_mode = XEN_EMULATE;
-
 static void xen_init_pv(ram_addr_t ram_size,
                        const char *boot_device,
                        const char *kernel_filename,
diff --git a/kvm-all.c b/kvm-all.c
index 534ead0..40b5a51 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -51,8 +51,6 @@ typedef struct KVMSlot

 typedef struct kvm_dirty_log KVMDirtyLog;

-int kvm_allowed = 0;
-
 struct KVMState
 {
     KVMSlot slots[32];
diff --git a/vl.c b/vl.c
index a2869b8..d9fc0cc 100644
--- a/vl.c
+++ b/vl.c
@@ -258,6 +258,10 @@ uint8_t qemu_uuid[16];
 static QEMUBootSetHandler *boot_set_handler;
 static void *boot_set_opaque;

+int kvm_allowed = 0;
+uint32_t xen_domid;
+enum xen_mode xen_mode = XEN_EMULATE;
+
 #ifdef SIGRTMIN
 #define SIG_IPI (SIGRTMIN+4)
 #else
-- 
1.6.2.4