summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-08-24 18:11:17 +0300
committerAvi Kivity <avi@redhat.com>2009-08-24 18:11:17 +0300
commit3836eba3231b6e4e33764c861d11fd757fdc26d9 (patch)
tree14d0d5e588138d4d811686589829d91450d22b01 /cpu-exec.c
parentMerge commit 'facd2857783d58387885ad7cb1e4a8386f241738' into upstream-merge (diff)
parentRoute PC irqs to ISA bus instead of i8259 directly (diff)
downloadqemu-kvm-3836eba3231b6e4e33764c861d11fd757fdc26d9.tar.gz
qemu-kvm-3836eba3231b6e4e33764c861d11fd757fdc26d9.tar.bz2
qemu-kvm-3836eba3231b6e4e33764c861d11fd757fdc26d9.zip
Merge commit '1452411b25fb207e7f442e5a5128f34b4939d31c' into upstream-merge
* commit '1452411b25fb207e7f442e5a5128f34b4939d31c': (38 commits) Route PC irqs to ISA bus instead of i8259 directly Makefile: fixed rule TAGS QEMU set irq0override in fw_cfg SMART ATA Functionality Add missing linefeed in error message Clean up VGA type selection; far too many variables being used to track one state leads to confusion if new variables are added. When using stdio monitor and VNC display, one can set or clear a VNC password; this should set or turn off VNC authentication as well. Don't segfault when changing VNC password on an SDL display. Fix detached migration with exec. Do not disable autostart for live migration make vga screen_dump use DisplayState properly Restore consistent formatting es1370: Remove unused indirection of PCIES1370State and ES1370State Fix device name completion for 'eject' Revert my commit c00a9de060124a988bd9847c095e5836488c6f01 Fix segfault of qemu-system-arm with PXA target sdl.c: support 32 bpp cursors Use corect depth from DisplaySurface in vmware_vga.c Remove the unnecessary and only global in musicpal.c Make musicpal.c use the I2C device and the Marvell 88w8618 audio device ... Conflicts: hw/pc.c Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-exec.c')
-rw-r--r--cpu-exec.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/cpu-exec.c b/cpu-exec.c
index 8f3f84c12..7275fd194 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -492,9 +492,6 @@ int cpu_exec(CPUState *env1)
env->exception_index = env->interrupt_index;
do_interrupt(env);
env->interrupt_index = 0;
-#if !defined(CONFIG_USER_ONLY)
- cpu_check_irqs(env);
-#endif
next_tb = 0;
}
} else if (interrupt_request & CPU_INTERRUPT_TIMER) {