diff options
author | Michael S. Tsirkin | 2011-06-14 16:51:11 +0200 |
---|---|---|
committer | Michael S. Tsirkin | 2011-06-15 17:27:15 +0200 |
commit | befeac45d4d9afb587eca9a27d975db4a7950960 (patch) | |
tree | aab24c856a3ea944e287d7f2591bb4bab6a56eb4 /target-microblaze/cpu.h | |
parent | print meaningful error message in case of --disable-vhost-net (diff) | |
parent | configure: Detect and don't try to use older libcurl (diff) | |
download | qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.gz qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.xz qemu-befeac45d4d9afb587eca9a27d975db4a7950960.zip |
Merge remote-tracking branch 'origin/master' into pci
Conflicts:
hw/virtio-pci.c
Diffstat (limited to 'target-microblaze/cpu.h')
-rw-r--r-- | target-microblaze/cpu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index 536222e4b8..78fe14ff35 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -41,6 +41,9 @@ struct CPUMBState; #define EXCP_HW_BREAK 5 #define EXCP_HW_EXCP 6 +/* MicroBlaze-specific interrupt pending bits. */ +#define CPU_INTERRUPT_NMI CPU_INTERRUPT_TGT_EXT_3 + /* Register aliases. R0 - R15 */ #define R_SP 1 #define SR_PC 0 |