Include hw/hw.h exactly where needed

[mirror_qemu.git] / include / sysemu / hvf.h

diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h
index e4e43f6468ef8887cf25ab2822c98f4ad39f4416..d211e808e9dfecbfcd099e41d091898e6a0c25a2 100644 (file)
--- a/include/sysemu/hvf.h
+++ b/include/sysemu/hvf.h
@@ -9,26 +9,24 @@
  */
 
 /* header to be included in non-HVF-specific code */
-#ifndef _HVF_H
-#define _HVF_H
 
-#include "config-host.h"
-#include "qemu/osdep.h"
-#include "qemu-common.h"
+#ifndef HVF_H
+#define HVF_H
+
+#include "cpu.h"
 #include "qemu/bitops.h"
 #include "exec/memory.h"
 #include "sysemu/accel.h"
 
-extern int hvf_disabled;
+extern bool hvf_allowed;
 #ifdef CONFIG_HVF
 #include <Hypervisor/hv.h>
 #include <Hypervisor/hv_vmx.h>
 #include <Hypervisor/hv_error.h>
 #include "target/i386/cpu.h"
-#include "hw/hw.h"
 uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,
                                  int reg);
-#define hvf_enabled() !hvf_disabled
+#define hvf_enabled() (hvf_allowed)
 #else
 #define hvf_enabled() 0
 #define hvf_get_supported_cpuid(func, idx, reg) 0