OSDN Git Service

target-ppc: Remove hack for ppc_hash64_load_hpte*() with HV KVM
authorDavid Gibson <david@gibson.dropbear.id.au>
Mon, 8 Feb 2016 23:30:21 +0000 (09:30 +1000)
committerDavid Gibson <david@gibson.dropbear.id.au>
Tue, 16 Feb 2016 22:59:30 +0000 (09:59 +1100)
commitfa48b4328c39b2532e47efcfcba6d4031512f514
tree7e76cc7defcc6322d6aff7ed9beddf2a2ee17819
parentc5f54f3e31bf693f70a98d4d73ea5dbe05689857
target-ppc: Remove hack for ppc_hash64_load_hpte*() with HV KVM

With HV KVM, the guest's hash page table (HPT) is managed by the kernel and
not directly accessible to QEMU.  This means that spapr->htab is NULL
and normally env->external_htab would also be NULL for each cpu.

However, that would cause ppc_hash64_load_hpte*() to do the wrong thing in
the few cases where QEMU does need to load entries from the in-kernel HPT.
Specifically, seeing external_htab is NULL, they would look for an HPT
within the guest's address space instead.

To stop that we have an ugly hack in the pseries machine type code to
set external htab to (void *)1 instead.

This patch removes that hack by having ppc_hash64_load_hpte*() explicitly
check kvmppc_kern_htab instead, which makes more sense.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
hw/ppc/spapr.c
target-ppc/mmu-hash64.h