diff options
| author | Juan Quintela <quintela@redhat.com> | 2012-03-19 23:57:36 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-04-15 18:23:47 +0200 |
| commit | 45e45ed2d61fb287adf03e49c74c152bfd2c975a (patch) | |
| tree | 19e186b77cddf79f55c5568f2639e00acdf557f0 | |
| parent | a5cabbda760c798bb551d53a697058de28fce51c (diff) | |
target-ppc/machine.c: Drop unnecessary ifdefs
machine.c is only compiled for softmmu targets, so checks for
!defined(CONFIG_USER_ONLY) are unnecessary and can be dropped.
Signed-off-by: Juan Quintela <quintela@redhat.com>
[AF: Use more verbose commit message suggested by PMM]
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | target-ppc/machine.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/target-ppc/machine.c b/target-ppc/machine.c index 70e25825fb..d6c2ee41b3 100644 --- a/target-ppc/machine.c +++ b/target-ppc/machine.c @@ -32,7 +32,6 @@ void cpu_save(QEMUFile *f, void *opaque) } qemu_put_be32s(f, &env->fpscr); qemu_put_sbe32s(f, &env->access_type); -#if !defined(CONFIG_USER_ONLY) #if defined(TARGET_PPC64) qemu_put_betls(f, &env->asr); qemu_put_sbe32s(f, &env->slb_nr); @@ -62,7 +61,6 @@ void cpu_save(QEMUFile *f, void *opaque) } for (i = 0; i < 4; i++) qemu_put_betls(f, &env->pb[i]); -#endif for (i = 0; i < 1024; i++) qemu_put_betls(f, &env->spr[i]); qemu_put_be32s(f, &env->vscr); @@ -72,7 +70,6 @@ void cpu_save(QEMUFile *f, void *opaque) qemu_put_be32s(f, &env->flags); qemu_put_sbe32s(f, &env->error_code); qemu_put_be32s(f, &env->pending_interrupts); -#if !defined(CONFIG_USER_ONLY) qemu_put_be32s(f, &env->irq_input_state); for (i = 0; i < POWERPC_EXCP_NB; i++) qemu_put_betls(f, &env->excp_vectors[i]); @@ -81,7 +78,6 @@ void cpu_save(QEMUFile *f, void *opaque) qemu_put_betls(f, &env->ivor_mask); qemu_put_betls(f, &env->ivpr_mask); qemu_put_betls(f, &env->hreset_vector); -#endif qemu_put_betls(f, &env->nip); qemu_put_betls(f, &env->hflags); qemu_put_betls(f, &env->hflags_nmsr); @@ -120,7 +116,6 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) } qemu_get_be32s(f, &env->fpscr); qemu_get_sbe32s(f, &env->access_type); -#if !defined(CONFIG_USER_ONLY) #if defined(TARGET_PPC64) qemu_get_betls(f, &env->asr); qemu_get_sbe32s(f, &env->slb_nr); @@ -150,7 +145,6 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) } for (i = 0; i < 4; i++) qemu_get_betls(f, &env->pb[i]); -#endif for (i = 0; i < 1024; i++) qemu_get_betls(f, &env->spr[i]); ppc_store_sdr1(env, sdr1); @@ -161,7 +155,6 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) qemu_get_be32s(f, &env->flags); qemu_get_sbe32s(f, &env->error_code); qemu_get_be32s(f, &env->pending_interrupts); -#if !defined(CONFIG_USER_ONLY) qemu_get_be32s(f, &env->irq_input_state); for (i = 0; i < POWERPC_EXCP_NB; i++) qemu_get_betls(f, &env->excp_vectors[i]); @@ -170,7 +163,6 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) qemu_get_betls(f, &env->ivor_mask); qemu_get_betls(f, &env->ivpr_mask); qemu_get_betls(f, &env->hreset_vector); -#endif qemu_get_betls(f, &env->nip); qemu_get_betls(f, &env->hflags); qemu_get_betls(f, &env->hflags_nmsr); |