From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv9E8-0008AU-5X for qemu-devel@nongnu.org; Mon, 23 Dec 2013 12:23:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vv9Dw-0000G4-6s for qemu-devel@nongnu.org; Mon, 23 Dec 2013 12:23:36 -0500 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:44384) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv9Dv-0000FA-Hk for qemu-devel@nongnu.org; Mon, 23 Dec 2013 12:23:24 -0500 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 23 Dec 2013 22:53:20 +0530 From: "Aneesh Kumar K.V" Date: Mon, 23 Dec 2013 22:53:00 +0530 Message-Id: <1387819381-26354-2-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1387819381-26354-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1387819381-26354-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH -V8 2/3] target-ppc: Update external_htab even when HTAB is managed by kernel List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: agraf@suse.de, paulus@samba.org Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, "Aneesh Kumar K.V" From: "Aneesh Kumar K.V" 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 --- hw/ppc/spapr.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index e99a66170661..3c0f29c99820 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -730,6 +730,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; /* * htab_mask is the mask used to normalize hash value to PTEG index. -- 1.8.3.2