diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-14 17:14:50 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-14 17:14:50 +0200 |
| commit | f63802005a1158a604ca2dbef6e7e40a9c96e3bd (patch) | |
| tree | 4962ef17fc668c70d8b8b8e670fb25bdbf6187c5 /cpu-defs.h | |
| parent | Merge commit 'b3dfdb5a3bae5fb3170397440dfebd579a3fcb04' into stable-0.12-merge (diff) | |
| parent | monitor: do_info_cpus(): Use QBool (diff) | |
| download | qemu-kvm-f63802005a1158a604ca2dbef6e7e40a9c96e3bd.tar.gz qemu-kvm-f63802005a1158a604ca2dbef6e7e40a9c96e3bd.tar.bz2 qemu-kvm-f63802005a1158a604ca2dbef6e7e40a9c96e3bd.zip | |
Merge commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46' into stable-0.12-merge
* commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46': (63 commits)
monitor: do_info_cpus(): Use QBool
monitor: Fix do_info_commands() output
monitor: Fix do_info_balloon() output
QDict: Introduce qdict_get_qlist()
QDict: Introduce qdict_get_qbool()
Makefile: move QObject objs to their own entry
Introduce qemu-objects.h header file
vnc: fix capslock tracking logic.
QemuOpts: allow larger option values.
scsi: fix drive hotplug.
pci: don't hw_error() when no slot is available.
pci: don't abort() when trying to hotplug with acpi off.
Set default console to virtio on S390x
default devices: virtio consoles.
add -qmp convinience switch
add new -mon switch
rework -monitor handling, switch to QemuOpts
un-static qemu_chr_parse_compat()
default devices: drives
default devices: network
...
Conflicts:
monitor.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, 1 insertions, 1 deletions
diff --git a/cpu-defs.h b/cpu-defs.h index cf502e992..0e4ed1616 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -188,7 +188,7 @@ struct KVMCPUState { \ /* Core interrupt code */ \ jmp_buf jmp_env; \ - int exception_index; \ + int32_t exception_index; \ \ CPUState *next_cpu; /* next CPU sharing TB cache */ \ int cpu_index; /* CPU index (informative) */ \ |