diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-20 12:36:44 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-20 12:36:44 +0200 |
| commit | 842d70aade6915b6ab403366bbdbcbe348809acf (patch) | |
| tree | 5d566d08e88a93e90c32a24ed21d7fb7160bc9cb /cpu-defs.h | |
| parent | Merge commit '2b311b3cce0e30dc361a4f67948a8ccfe4db248d' into stable-0.12-merge (diff) | |
| parent | Support PCI based option rom loading (diff) | |
| download | qemu-kvm-842d70aade6915b6ab403366bbdbcbe348809acf.tar.gz qemu-kvm-842d70aade6915b6ab403366bbdbcbe348809acf.tar.bz2 qemu-kvm-842d70aade6915b6ab403366bbdbcbe348809acf.zip | |
Merge commit '72bb3c7571226af13cfe9eec020a56add3d30a70' into stable-0.12-merge
* commit '72bb3c7571226af13cfe9eec020a56add3d30a70':
Support PCI based option rom loading
Fix backcompat for hotplug of SCSI controllers
fdc: fix migration from 0.11
Revert "fdc: fix vmstate variable passed"
monitor: Accept input only byte-wise
Revert "kvm: x86: Save/restore exception_index"
vmware: increase cursor buffer size.
Conflicts:
hw/pci.c
hw/pci.h
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 0e4ed1616..cf502e992 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -188,7 +188,7 @@ struct KVMCPUState { \ /* Core interrupt code */ \ jmp_buf jmp_env; \ - int32_t exception_index; \ + int exception_index; \ \ CPUState *next_cpu; /* next CPU sharing TB cache */ \ int cpu_index; /* CPU index (informative) */ \ |