OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hax: remove hax specific functions from global includes

Browse Source 
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Claudio Fontana 2020-08-11 18:47:21 +02:00 committed by Paolo Bonzini
parent 77c050b5ec
commit b2d61ea448
9 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
accel/stubs/hax-stub.c
View File

@ -21,13 +21,3 @@ int hax_sync_vcpus(void)
{
return 0;
}
int hax_init_vcpu(CPUState *cpu)
{
return -ENOSYS;
}
int hax_smp_cpu_exec(CPUState *cpu)
{
return -ENOSYS;
}

17
include/sysemu/hax.h
View File

@ -22,29 +22,12 @@
#ifndef QEMU_HAX_H
#define QEMU_HAX_H
int hax_sync_vcpus(void);
int hax_init_vcpu(CPUState *cpu);
int hax_smp_cpu_exec(CPUState *cpu);
int hax_populate_ram(uint64_t va, uint64_t size);
void hax_cpu_synchronize_state(CPUState *cpu);
void hax_cpu_synchronize_post_reset(CPUState *cpu);
void hax_cpu_synchronize_post_init(CPUState *cpu);
void hax_cpu_synchronize_pre_loadvm(CPUState *cpu);
#ifdef CONFIG_HAX
int hax_enabled(void);
#include "qemu/bitops.h"
#include "exec/memory.h"
int hax_vcpu_destroy(CPUState *cpu);
void hax_raise_event(CPUState *cpu);
void hax_reset_vcpu_state(void *opaque);
#include "target/i386/hax-interface.h"
#include "target/i386/hax-i386.h"
#else /* CONFIG_HAX */
#define hax_enabled() (0)

1
target/i386/hax-all.c
View File

@ -28,7 +28,6 @@
#include "exec/address-spaces.h"
#include "qemu-common.h"
#include "hax-i386.h"
#include "sysemu/accel.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"

1
target/i386/hax-cpus.c
View File

@ -22,7 +22,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "hax-i386.h"
#include "sysemu/runstate.h"
#include "sysemu/cpus.h"
#include "qemu/guest-random.h"

16
target/i386/hax-cpus.h
View File

@ -14,4 +14,20 @@
extern const CpusAccel hax_cpus;
#include "hax-interface.h"
#include "hax-i386.h"
int hax_init_vcpu(CPUState *cpu);
int hax_smp_cpu_exec(CPUState *cpu);
int hax_populate_ram(uint64_t va, uint64_t size);
void hax_cpu_synchronize_state(CPUState *cpu);
void hax_cpu_synchronize_post_reset(CPUState *cpu);
void hax_cpu_synchronize_post_init(CPUState *cpu);
void hax_cpu_synchronize_pre_loadvm(CPUState *cpu);
int hax_vcpu_destroy(CPUState *cpu);
void hax_raise_event(CPUState *cpu);
void hax_reset_vcpu_state(void *opaque);
#endif /* HAX_CPUS_H */

2
target/i386/hax-mem.c
View File

@ -13,7 +13,7 @@
#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "target/i386/hax-i386.h"
#include "hax-cpus.h"
#include "qemu/queue.h"
#define DEBUG_HAX_MEM 0

3
target/i386/hax-posix.c
View File

@ -14,9 +14,8 @@
#include "qemu/osdep.h"
#include <sys/ioctl.h>
#include "target/i386/hax-i386.h"
#include "sysemu/cpus.h"
#include "hax-cpus.h"
hax_fd hax_mod_open(void)
{

2
target/i386/hax-windows.c
View File

@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "hax-i386.h"
#include "hax-cpus.h"
/*
* return 0 when success, -1 when driver not loaded,

2
target/i386/hax-windows.h
View File

@ -23,6 +23,8 @@
#include <winioctl.h>
#include <windef.h>
#include "hax-cpus.h"
#define HAX_INVALID_FD INVALID_HANDLE_VALUE
static inline void hax_mod_close(struct hax_state *hax)