diff options
author | 2009-06-25 17:33:52 +0300 | |
---|---|---|
committer | 2009-06-25 17:33:52 +0300 | |
commit | 3c4cf0a9bb1c2cd5639374ca4e0c686ba93931d3 (patch) | |
tree | 47f17c79e03bcd19804367ada9c0414fdea872be /cpu-all.h | |
parent | Merge commit '406c8df3a96414c2c9602081727f0782369de699' into upstream-merge (diff) | |
parent | Handle init/sipi in a main cpu exec loop. (v2) (diff) | |
download | qemu-kvm-3c4cf0a9bb1c2cd5639374ca4e0c686ba93931d3.tar.gz qemu-kvm-3c4cf0a9bb1c2cd5639374ca4e0c686ba93931d3.tar.bz2 qemu-kvm-3c4cf0a9bb1c2cd5639374ca4e0c686ba93931d3.zip |
Merge commit 'b09ea7d55cfab5a75912bb56ed1fcd757604a759' into upstream-merge
* commit 'b09ea7d55cfab5a75912bb56ed1fcd757604a759':
Handle init/sipi in a main cpu exec loop. (v2)
Add pci_bus_reset() function.
virtio: add support for indirect ring entries
virtio: make vring_desc_*() take phys addrs
Add O_BINARY to open call in net_dump_init.
Conflicts:
hw/apic.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-all.h')
-rw-r--r-- | cpu-all.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -768,6 +768,8 @@ extern int use_icount; #define CPU_INTERRUPT_DEBUG 0x80 /* Debug event occured. */ #define CPU_INTERRUPT_VIRQ 0x100 /* virtual interrupt pending. */ #define CPU_INTERRUPT_NMI 0x200 /* NMI pending. */ +#define CPU_INTERRUPT_INIT 0x400 /* INIT pending. */ +#define CPU_INTERRUPT_SIPI 0x800 /* SIPI pending. */ void cpu_interrupt(CPUState *s, int mask); void cpu_reset_interrupt(CPUState *env, int mask); |