diff options
| author |   Avi Kivity <avi@redhat.com> | 2008-11-09 19:14:21 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-11-09 20:30:19 +0200 |
| commit | ba2b62d42a025d9ab371ecb441ad1cb8007d9f34 (patch) | |
| tree | ec6b3e441f6e9d9006e9ea21ff41e0f86b37a1e7 /cpu-defs.h | |
| parent | kvm: external module: update .gitignore (diff) | |
| parent | Sparc32 BSD user support (diff) | |
| download | qemu-kvm-ba2b62d42a025d9ab371ecb441ad1cb8007d9f34.tar.gz qemu-kvm-ba2b62d42a025d9ab371ecb441ad1cb8007d9f34.tar.bz2 qemu-kvm-ba2b62d42a025d9ab371ecb441ad1cb8007d9f34.zip | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/block.c
qemu/configure
qemu/cpu-exec.c
qemu/exec.c
qemu/hw/acpi.c
qemu/hw/pc.c
qemu/monitor.c
qemu/target-i386/cpu.h
qemu/target-i386/helper.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-defs.h')
| -rw-r--r-- | cpu-defs.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cpu-defs.h b/cpu-defs.h index aca84324f..ce3d98ea0 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -142,6 +142,9 @@ typedef struct icount_decr_u16 { } icount_decr_u16; #endif +struct kvm_run; +struct KVMState; + #define CPU_TEMP_BUF_NLONGS 128 #define CPU_COMMON \ struct TranslationBlock *current_tb; /* currently executing TB */ \ @@ -200,6 +203,9 @@ typedef struct icount_decr_u16 { /* user data */ \ void *opaque; \ \ - const char *cpu_model_str; + const char *cpu_model_str; \ + struct KVMState *kvm_state; \ + struct kvm_run *kvm_run; \ + int kvm_fd; #endif |