i386: hvf: header cleanup

Remove inclusions of system headers and avoid "pragma once".

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2017-10-03 15:36:05 +02:00
parent 69e0a03c3f
commit f9fea77740
9 changed files with 17 additions and 20 deletions

View File

@ -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 @@ static inline uint64_t rdtscp(void)
return tsc;
}
#endif

View File

@ -21,6 +21,7 @@
*/
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "x86.h"
#include "vmx.h"
#include "sysemu/hvf.h"

View File

@ -18,6 +18,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "x86_decode.h"
#include "string.h"
#include "vmx.h"

View File

@ -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 @@ 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

View File

@ -18,6 +18,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "vmx.h"
#include "x86_descr.h"

View File

@ -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

View File

@ -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"

View File

@ -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) {\

View File

@ -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"