summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-07-12 18:18:05 +0300
committerAvi Kivity <avi@redhat.com>2009-07-12 18:18:05 +0300
commitb9e6b52ae05ab49ec0be74b4813efeadc11ab350 (patch)
tree318ce42ea9c3c5ae8f16d38ea88cb96594a81020 /cpu-exec.c
parentMerge commit '72755a709619b1db204c675df8f1093d54e38128' into upstream-merge (diff)
parenttarget-mips: remove useless code in gen_st_cond() (diff)
downloadqemu-kvm-b9e6b52ae05ab49ec0be74b4813efeadc11ab350.tar.gz
qemu-kvm-b9e6b52ae05ab49ec0be74b4813efeadc11ab350.tar.bz2
qemu-kvm-b9e6b52ae05ab49ec0be74b4813efeadc11ab350.zip
Merge commit '344b983d9b653b47468b6f5b5a4fbbdc8894995f' into upstream-merge
* commit '344b983d9b653b47468b6f5b5a4fbbdc8894995f': target-mips: remove useless code in gen_st_cond() Fix MIPS SC Sparc64: convert ebus to qdev sparc64: trap handling corrections Sparc32: convert eccmemctl to qdev sparc64: fix helper_st_asi little endian case typo sparc64: really initialize irq sparc64: unify mmu tag matching code sparc64: mmu bypass mode correction Fix PCI IRQ breakage Revert "Fix the PCI header type of APB" Fix APB by reverting 16eaedf2668e9b347a59d73346fcc4c764c58348 partially Indent ac97 and es1370 according to audio formatting block: Clean up after deleting BHs flush pending aio requests kvm: Work around borken MSR_GET_INDEX_LIST qemu/virtio: mark msi vectors used on load Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-exec.c')
-rw-r--r--cpu-exec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu-exec.c b/cpu-exec.c
index cc0ba6ebb..35c71bd0f 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -482,7 +482,7 @@ int cpu_exec(CPUState *env1)
}
#elif defined(TARGET_SPARC)
if ((interrupt_request & CPU_INTERRUPT_HARD) &&
- (env->psret != 0)) {
+ cpu_interrupts_enabled(env)) {
int pil = env->interrupt_index & 15;
int type = env->interrupt_index & 0xf0;
@@ -493,7 +493,7 @@ int cpu_exec(CPUState *env1)
env->exception_index = env->interrupt_index;
do_interrupt(env);
env->interrupt_index = 0;
-#if !defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY)
+#if !defined(CONFIG_USER_ONLY)
cpu_check_irqs(env);
#endif
next_tb = 0;