diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-20 12:22:03 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-20 12:22:03 +0200 |
| commit | 5d594a6c22d4ecbcc8ebdaf3b537173116663c19 (patch) | |
| tree | 9d428505772eb0046127669ed249e0c7ec3a30d9 /target-ppc | |
| parent | Remove pcbios subdirectory (diff) | |
| parent | Revert "pci: interrupt disable bit support" (diff) | |
| download | qemu-kvm-5d594a6c22d4ecbcc8ebdaf3b537173116663c19.tar.gz qemu-kvm-5d594a6c22d4ecbcc8ebdaf3b537173116663c19.tar.bz2 qemu-kvm-5d594a6c22d4ecbcc8ebdaf3b537173116663c19.zip | |
Merge commit '686a3c3dc235df2492e754423799d1abe4f6d9e2' into stable-0.12-merge
* commit '686a3c3dc235df2492e754423799d1abe4f6d9e2':
Revert "pci: interrupt disable bit support"
target-ppc: fix ppc32 kvm build
S390: Bail out without KVM
S390: Don't tell guest we're updating config space
add default virtcon initialization
S390: Loop through virtio console devices
target-s390: Fail on unknown instructions
osdep: Fix runtime failure on older Linux kernels
Fix a make -j race
target-alpha: Fix generic ctz64.
s390: Fix buggy assignment
target-mips: fix user-mode emulation startup
Conflicts:
hw/pci.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/kvm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 2b5abf430..0424a7842 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -135,10 +135,12 @@ int kvm_arch_get_registers(CPUState *env) env->sdr1 = sregs.u.s.sdr1; /* Sync SLB */ +#ifdef TARGET_PPC64 for (i = 0; i < 64; i++) { ppc_store_slb(env, sregs.u.s.ppc64.slb[i].slbe, sregs.u.s.ppc64.slb[i].slbv); } +#endif /* Sync SRs */ for (i = 0; i < 16; i++) { |