Message ID | 1390896003-3195-2-git-send-email-aneesh.kumar@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 1b4e38f50a8d..ac62c8f9294b 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -740,6 +740,13 @@ static void spapr_cpu_reset(void *opaque) env->spr[SPR_HIOR] = 0; env->external_htab = (uint8_t *)spapr->htab; + if (kvm_enabled() && !env->external_htab) { + /* + * HV KVM, set external_htab to 1 so our ppc_hash64_load_hpte* + * functions do the right thing. + */ + env->external_htab = (void *)1; + } env->htab_base = -1; env->htab_mask = HTAB_SIZE(spapr) - 1; env->spr[SPR_SDR1] = (target_ulong)(uintptr_t)spapr->htab |
We will use this in later patches to make sure we use the right load functions when copying hpte entries. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> --- hw/ppc/spapr.c | 7 +++++++ 1 file changed, 7 insertions(+)