diff options
| author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2014-02-20 18:52:17 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2014-03-05 03:07:02 +0100 |
| commit | f3c75d42adbba553eaf218a832d4fbea32c8f7b8 (patch) | |
| tree | 632fbedc382ce1a97ee5cc21a55dd61f8a5a4c7d /target-ppc/machine.c | |
| parent | 3707cd62db79ba965a211b9e2bb808792ae7343a (diff) | |
| download | qemu-f3c75d42adbba553eaf218a832d4fbea32c8f7b8.zip qemu-f3c75d42adbba553eaf218a832d4fbea32c8f7b8.tar.gz qemu-f3c75d42adbba553eaf218a832d4fbea32c8f7b8.tar.bz2 | |
target-ppc: Fix htab_mask calculation
Correctly update the htab_mask using the return value of
KVM_PPC_ALLOCATE_HTAB ioctl. Also we don't update sdr1
on GET_SREGS for HV. We check for external htab and if
found true, we don't need to update sdr1
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[ fixed pte group offset computation in ppc_hash64_htab_lookup() that
caused TCG to fail, Greg Kurz <gkurz@linux.vnet.ibm.com> ]
Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-ppc/machine.c')
| -rw-r--r-- | target-ppc/machine.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/target-ppc/machine.c b/target-ppc/machine.c index 12c174f..2d46cec 100644 --- a/target-ppc/machine.c +++ b/target-ppc/machine.c @@ -70,7 +70,9 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int version_id) qemu_get_betls(f, &env->pb[i]); for (i = 0; i < 1024; i++) qemu_get_betls(f, &env->spr[i]); - ppc_store_sdr1(env, sdr1); + if (!env->external_htab) { + ppc_store_sdr1(env, sdr1); + } qemu_get_be32s(f, &env->vscr); qemu_get_be64s(f, &env->spe_acc); qemu_get_be32s(f, &env->spe_fscr); @@ -179,9 +181,10 @@ static int cpu_post_load(void *opaque, int version_id) env->IBAT[1][i+4] = env->spr[SPR_IBAT4U + 2*i + 1]; } - /* Restore htab_base and htab_mask variables */ - ppc_store_sdr1(env, env->spr[SPR_SDR1]); - + if (!env->external_htab) { + /* Restore htab_base and htab_mask variables */ + ppc_store_sdr1(env, env->spr[SPR_SDR1]); + } hreg_compute_hflags(env); hreg_compute_mem_idx(env); |