Revision 1c14f162

b/balloon.h
14 14
#ifndef _QEMU_BALLOON_H
15 15
#define _QEMU_BALLOON_H
16 16

  
17
#include "cpu-defs.h"
18

  
19 17
typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target,
20 18
                                MonitorCompletion cb, void *cb_data);
21 19

  
b/gdbstub.h
10 10
#define GDB_WATCHPOINT_READ      3
11 11
#define GDB_WATCHPOINT_ACCESS    4
12 12

  
13
#ifdef NEED_CPU_H
13 14
typedef void (*gdb_syscall_complete_cb)(CPUState *env,
14 15
                                        target_ulong ret, target_ulong err);
15 16

  
......
21 22
int gdb_handlesig (CPUState *, int);
22 23
void gdb_exit(CPUState *, int);
23 24
void gdb_signalled(CPUState *, int);
24
int gdbserver_start(int);
25 25
void gdbserver_fork(CPUState *);
26
#else
27
int gdbserver_start(const char *port);
28 26
#endif
29 27
/* Get or set a register.  Returns the size of the register.  */
30 28
typedef int (*gdb_reg_cb)(CPUState *env, uint8_t *buf, int reg);
......
33 31
                              int num_regs, const char *xml, int g_pos);
34 32

  
35 33
#endif
34

  
35
#ifdef CONFIG_USER_ONLY
36
int gdbserver_start(int);
37
#else
38
int gdbserver_start(const char *port);
39
#endif
40

  
41
#endif
b/kvm.h
14 14
#ifndef QEMU_KVM_H
15 15
#define QEMU_KVM_H
16 16

  
17
#include "config.h"
17
#include "config-host.h"
18 18
#include "qemu-queue.h"
19 19

  
20
#ifdef CONFIG_KVM
21 20
extern int kvm_allowed;
22 21

  
22
#ifdef CONFIG_KVM
23 23
#define kvm_enabled() (kvm_allowed)
24 24
#else
25 25
#define kvm_enabled() (0)
......
31 31

  
32 32
int kvm_init(int smp_cpus);
33 33

  
34
#ifdef NEED_CPU_H
34 35
int kvm_init_vcpu(CPUState *env);
35 36

  
36 37
int kvm_cpu_exec(CPUState *env);
......
160 161
        kvm_cpu_synchronize_post_init(env);
161 162
    }
162 163
}
163

  
164
#endif
164 165
#endif

Also available in: Unified diff