Remove inclusions of system headers and avoid "pragma once". Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- target/i386/hvf/x86.h | 8 +++----- target/i386/hvf/x86_decode.h | 9 ++++----- target/i386/hvf/x86_descr.h | 5 ++++- 3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/target/i386/hvf/x86.h b/target/i386/hvf/x86.h index 7fd8fede80..ae957fc895 100644 --- a/target/i386/hvf/x86.h +++ b/target/i386/hvf/x86.h @@ -16,12 +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" @@ -474,3 +471,4 @@ static inline uint64_t rdtscp(void) return tsc; } +#endif diff --git a/target/i386/hvf/x86_decode.h b/target/i386/hvf/x86_decode.h index 329131360f..50957819f6 100644 --- a/target/i386/hvf/x86_decode.h +++ b/target/i386/hvf/x86_decode.h @@ -15,12 +15,9 @@ * 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" @@ -323,3 +320,5 @@ void calc_modrm_operand64(CPUX86State *env, struct x86_decode *decode, 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.h b/target/i386/hvf/x86_descr.h index 1285dd3897..034d8e95c5 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 @@ uint32_t vmx_read_segment_ar(CPUState *cpu, x86_reg_segment seg); void vmx_segment_to_x86_descriptor(struct CPUState *cpu, struct vmx_segment *vmx_desc, struct x86_segment_descriptor *desc); + +#endif -- 2.13.6
