aboutsummaryrefslogtreecommitdiff
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 /target-ppc
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 'target-ppc')
-rw-r--r--target-ppc/cpu.h2
-rw-r--r--target-ppc/helper.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 2c850a7cd..339468e95 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -735,8 +735,6 @@ void ppc_store_sr (CPUPPCState *env, int srnum, target_ulong value);
#endif /* !defined(CONFIG_USER_ONLY) */
void ppc_store_msr (CPUPPCState *env, target_ulong value);
-void cpu_ppc_reset (void *opaque);
-
void ppc_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
const ppc_def_t *cpu_ppc_find_by_name (const char *name);
diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index ba2a49534..d6197377b 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -2749,9 +2749,8 @@ void cpu_dump_rfi (target_ulong RA, target_ulong msr)
TARGET_FMT_lx "\n", RA, msr);
}
-void cpu_ppc_reset (void *opaque)
+void cpu_reset(CPUPPCState *env)
{
- CPUPPCState *env = opaque;
target_ulong msr;
if (qemu_loglevel_mask(CPU_LOG_RESET)) {
@@ -2812,7 +2811,6 @@ CPUPPCState *cpu_ppc_init (const char *cpu_model)
ppc_translate_init();
env->cpu_model_str = cpu_model;
cpu_ppc_register_internal(env, def);
- cpu_ppc_reset(env);
qemu_init_vcpu(env);