summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-11-22 12:50:34 +0200
committerAvi Kivity <avi@redhat.com>2009-11-22 12:50:34 +0200
commit5d968c942adbc48188dbbcf7d85e69c2e0d7cd8a (patch)
tree9f26712ac1ad260074d5aea7d60c37d467eb4210 /cpu-exec.c
parentRevert bios to last qemu-kvm version of pcbios.bin (diff)
parentAdded readonly flag to -drive command (diff)
downloadqemu-kvm-5d968c942adbc48188dbbcf7d85e69c2e0d7cd8a.tar.gz
qemu-kvm-5d968c942adbc48188dbbcf7d85e69c2e0d7cd8a.tar.bz2
qemu-kvm-5d968c942adbc48188dbbcf7d85e69c2e0d7cd8a.zip
Merge commit '59f2689d9082f2f631253c810f73cd22290144a9' into upstream-merge
* commit '59f2689d9082f2f631253c810f73cd22290144a9': Added readonly flag to -drive command qcow2: Allow qcow2 disk images with size zero (x86/Sparc/PPC)-user: fix cpu_copy IDE: Fix reset handling user: move CPU reset call to main.c for x86/PPC/Sparc PPC: rename cpu_ppc_reset to cpu_reset for consistency Sparc64/x86: remove unneeded calls to device reset PPC: remove unneeded calls to device reset sparc32 (mostly): remove unneeded calls to device reset v3: don't call reset functions on cpu initialization vga: fix line comparison vga: Respect Line Compare Register in text modes Conflicts: qemu-config.c Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-exec.c')
-rw-r--r--cpu-exec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu-exec.c b/cpu-exec.c
index 675e4ccbe..b20ad60ce 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -423,7 +423,7 @@ int cpu_exec(CPUState *env1)
#elif defined(TARGET_PPC)
#if 0
if ((interrupt_request & CPU_INTERRUPT_RESET)) {
- cpu_ppc_reset(env);
+ cpu_reset(env);
}
#endif
if (interrupt_request & CPU_INTERRUPT_HARD) {