diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-01-18 12:36:25 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-01-18 12:36:25 +0200 |
| commit | 931c5ab4bfd044e8dfc264ad4fda6ac62e078316 (patch) | |
| tree | e75853dd4bfa7f1fee2fb1ddbce0510178b0f2a6 /cpu-defs.h | |
| parent | Device-assignment: fix ROM writing (diff) | |
| parent | Remove unused info_str parameter to pcnet_common_init() (diff) | |
| download | qemu-kvm-931c5ab4bfd044e8dfc264ad4fda6ac62e078316.tar.gz qemu-kvm-931c5ab4bfd044e8dfc264ad4fda6ac62e078316.tar.bz2 qemu-kvm-931c5ab4bfd044e8dfc264ad4fda6ac62e078316.zip | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/hw/cirrus_vga.c
qemu/hw/pc.c
qemu/hw/pcnet.c
qemu/hw/vga.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-defs.h')
| -rw-r--r-- | cpu-defs.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cpu-defs.h b/cpu-defs.h index acbe380c2..2021c6ea6 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -216,8 +216,6 @@ struct KVMCPUState { jmp_buf jmp_env; \ int exception_index; \ \ - int user_mode_only; \ - \ void *next_cpu; /* next CPU sharing TB cache */ \ int cpu_index; /* CPU index (informative) */ \ int running; /* Nonzero if cpu is currently running(usermode). */ \ |