mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow various header files to be included from non-CPU code

Browse Source 
Allow balloon.h, gdbstub.h and kvm.h to be included from
non-CPU code.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2010-03-29 19:23:47 +00:00
parent 54fc6ea92b
commit 1c14f162dd
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
balloon.h
View File

@ -14,8 +14,6 @@
#ifndef _QEMU_BALLOON_H #ifndef _QEMU_BALLOON_H
#define _QEMU_BALLOON_H #define _QEMU_BALLOON_H
#include "cpu-defs.h"
typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target, typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target,
MonitorCompletion cb, void *cb_data); MonitorCompletion cb, void *cb_data);

12
gdbstub.h
View File

@ -10,6 +10,7 @@
#define GDB_WATCHPOINT_READ 3 #define GDB_WATCHPOINT_READ 3
#define GDB_WATCHPOINT_ACCESS 4 #define GDB_WATCHPOINT_ACCESS 4
#ifdef NEED_CPU_H
typedef void (*gdb_syscall_complete_cb)(CPUState *env, typedef void (*gdb_syscall_complete_cb)(CPUState *env,
target_ulong ret, target_ulong err); target_ulong ret, target_ulong err);
@ -21,10 +22,7 @@ int gdb_queuesig (void);
int gdb_handlesig (CPUState *, int); int gdb_handlesig (CPUState *, int);
void gdb_exit(CPUState *, int); void gdb_exit(CPUState *, int);
void gdb_signalled(CPUState *, int); void gdb_signalled(CPUState *, int);
int gdbserver_start(int);
void gdbserver_fork(CPUState *); void gdbserver_fork(CPUState *);
#else
int gdbserver_start(const char *port);
#endif #endif
/* Get or set a register. Returns the size of the register. */ /* Get or set a register. Returns the size of the register. */
typedef int (*gdb_reg_cb)(CPUState *env, uint8_t *buf, int reg); typedef int (*gdb_reg_cb)(CPUState *env, uint8_t *buf, int reg);
@ -33,3 +31,11 @@ void gdb_register_coprocessor(CPUState *env,
int num_regs, const char *xml, int g_pos); int num_regs, const char *xml, int g_pos);
#endif #endif
#ifdef CONFIG_USER_ONLY
int gdbserver_start(int);
#else
int gdbserver_start(const char *port);
#endif
#endif

7
kvm.h
View File

@ -14,12 +14,12 @@
#ifndef QEMU_KVM_H #ifndef QEMU_KVM_H
#define QEMU_KVM_H #define QEMU_KVM_H
#include "config.h" #include "config-host.h"
#include "qemu-queue.h" #include "qemu-queue.h"
#ifdef CONFIG_KVM
extern int kvm_allowed; extern int kvm_allowed;
#ifdef CONFIG_KVM
#define kvm_enabled() (kvm_allowed) #define kvm_enabled() (kvm_allowed)
#else #else
#define kvm_enabled() (0) #define kvm_enabled() (0)
@ -31,6 +31,7 @@ struct kvm_run;
int kvm_init(int smp_cpus); int kvm_init(int smp_cpus);
#ifdef NEED_CPU_H
int kvm_init_vcpu(CPUState *env); int kvm_init_vcpu(CPUState *env);
int kvm_cpu_exec(CPUState *env); int kvm_cpu_exec(CPUState *env);
@ -160,5 +161,5 @@ static inline void cpu_synchronize_post_init(CPUState *env)
kvm_cpu_synchronize_post_init(env); kvm_cpu_synchronize_post_init(env);
} }
} }
#endif
#endif #endif