From d745bef890f9fa57298ae099365da8e8aa575cbd Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Mon, 29 Mar 2010 19:23:49 +0000 Subject: [PATCH] Move KVM and Xen global flags to vl.c Signed-off-by: Blue Swirl --- 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 162f88db33..586214d8ba 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 534ead060d..40b5a51f5e 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 a2869b8dbe..d9fc0cc740 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 -- 2.11.4.GIT