diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-08-30 15:52:09 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-08-30 15:52:09 +0300 |
| commit | 9c1257ac640c0e0ddd39d578666f36cac6f04e69 (patch) | |
| tree | c7196c1f339563687d762182b5d9b82ddae383b7 /target-ppc | |
| parent | Merge commit '09aaa1602f9381c0e0fb539390b1793e51bdfc7b' into upstream-merge (diff) | |
| parent | kvm: Simplify cpu_synchronize_state() (diff) | |
| download | qemu-kvm-9c1257ac640c0e0ddd39d578666f36cac6f04e69.tar.gz qemu-kvm-9c1257ac640c0e0ddd39d578666f36cac6f04e69.tar.bz2 qemu-kvm-9c1257ac640c0e0ddd39d578666f36cac6f04e69.zip | |
Merge commit '4c0960c0c483fffc5f8e1dab169d946ac295bf44' into upstream-merge
* commit '4c0960c0c483fffc5f8e1dab169d946ac295bf44':
kvm: Simplify cpu_synchronize_state()
Conflicts:
hw/apic.c
target-i386/machine.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/machine.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target-ppc/machine.c b/target-ppc/machine.c index 101f408b5..ead38e180 100644 --- a/target-ppc/machine.c +++ b/target-ppc/machine.c @@ -8,7 +8,7 @@ void cpu_save(QEMUFile *f, void *opaque) CPUState *env = (CPUState *)opaque; unsigned int i, j; - cpu_synchronize_state(env, 0); + cpu_synchronize_state(env); for (i = 0; i < 32; i++) qemu_put_betls(f, &env->gpr[i]); @@ -97,6 +97,8 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) CPUState *env = (CPUState *)opaque; unsigned int i, j; + cpu_synchronize_state(env); + for (i = 0; i < 32; i++) qemu_get_betls(f, &env->gpr[i]); #if !defined(TARGET_PPC64) @@ -178,7 +180,5 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) qemu_get_sbe32s(f, &env->mmu_idx); qemu_get_sbe32s(f, &env->power_mode); - cpu_synchronize_state(env, 1); - return 0; } |