i386: hvf: header cleanup
Remove inclusions of system headers and avoid "pragma once".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/target/i386/hvf/x86.h b/target/i386/hvf/x86.h
index 250364b..2dc5547 100644
--- a/target/i386/hvf/x86.h
+++ b/target/i386/hvf/x86.h
@@ -16,13 +16,9 @@
* License along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#pragma once
+#ifndef HVF_X86_H
+#define HVF_X86_H 1
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <stdarg.h>
-#include "qemu-common.h"
#include "x86_gen.h"
/* exceptions */
@@ -467,3 +463,4 @@
return tsc;
}
+#endif
diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c
index 103223a..bcb9705 100644
--- a/target/i386/hvf/x86_cpuid.c
+++ b/target/i386/hvf/x86_cpuid.c
@@ -21,6 +21,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu-common.h"
#include "x86.h"
#include "vmx.h"
#include "sysemu/hvf.h"
diff --git a/target/i386/hvf/x86_decode.c b/target/i386/hvf/x86_decode.c
index 623c051..2a42a67 100644
--- a/target/i386/hvf/x86_decode.c
+++ b/target/i386/hvf/x86_decode.c
@@ -18,6 +18,7 @@
#include "qemu/osdep.h"
+#include "qemu-common.h"
#include "x86_decode.h"
#include "string.h"
#include "vmx.h"
diff --git a/target/i386/hvf/x86_decode.h b/target/i386/hvf/x86_decode.h
index 3291313..3e1eca0 100644
--- a/target/i386/hvf/x86_decode.h
+++ b/target/i386/hvf/x86_decode.h
@@ -15,15 +15,11 @@
* License along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#pragma once
+#ifndef HVF_X86_DECODE_H
+#define HVF_X86_DECODE_H 1
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <stdarg.h>
-#include "qemu-common.h"
-#include "x86.h"
#include "cpu.h"
+#include "x86.h"
typedef enum x86_prefix {
/* group 1 */
@@ -323,3 +319,5 @@
struct x86_decode_op *op);
void set_addressing_size(CPUX86State *env, struct x86_decode *decode);
void set_operand_size(CPUX86State *env, struct x86_decode *decode);
+
+#endif
diff --git a/target/i386/hvf/x86_descr.c b/target/i386/hvf/x86_descr.c
index 0b95628..b4a7cdd 100644
--- a/target/i386/hvf/x86_descr.c
+++ b/target/i386/hvf/x86_descr.c
@@ -18,6 +18,7 @@
#include "qemu/osdep.h"
+#include "qemu-common.h"
#include "vmx.h"
#include "x86_descr.h"
diff --git a/target/i386/hvf/x86_descr.h b/target/i386/hvf/x86_descr.h
index 1285dd3..034d8e9 100644
--- a/target/i386/hvf/x86_descr.h
+++ b/target/i386/hvf/x86_descr.h
@@ -16,7 +16,8 @@
* License along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#pragma once
+#ifndef HVF_X86_DESCR_H
+#define HVF_X86_DESCR_H 1
#include "x86.h"
@@ -53,3 +54,5 @@
void vmx_segment_to_x86_descriptor(struct CPUState *cpu,
struct vmx_segment *vmx_desc,
struct x86_segment_descriptor *desc);
+
+#endif
diff --git a/target/i386/hvf/x86_flags.c b/target/i386/hvf/x86_flags.c
index c833774..d2693f2 100644
--- a/target/i386/hvf/x86_flags.c
+++ b/target/i386/hvf/x86_flags.c
@@ -22,8 +22,8 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu-common.h"
#include "cpu.h"
#include "x86_flags.h"
#include "x86.h"
diff --git a/target/i386/hvf/x86_gen.h b/target/i386/hvf/x86_gen.h
index 2045b0e..69edeff 100644
--- a/target/i386/hvf/x86_gen.h
+++ b/target/i386/hvf/x86_gen.h
@@ -18,10 +18,6 @@
#ifndef __X86_GEN_H__
#define __X86_GEN_H__
-#include <stdlib.h>
-#include <stdio.h>
-#include "qemu-common.h"
-
typedef uint64_t addr_t;
#define VM_PANIC(x) {\
diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c
index c7a72d1..371a4b3 100644
--- a/target/i386/hvf/x86hvf.c
+++ b/target/i386/hvf/x86hvf.c
@@ -18,8 +18,8 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu-common.h"
#include "x86hvf.h"
#include "vmx.h"
#include "vmcs.h"
