From patchwork Thu Oct 18 05:50:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 192200 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AD3E32C0093 for ; Thu, 18 Oct 2012 18:16:50 +1100 (EST) Received: from localhost ([::1]:38856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOj0C-0006y9-3h for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 01:50:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOizN-0005ex-Iz for qemu-devel@nongnu.org; Thu, 18 Oct 2012 01:49:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOizF-0007dt-R4 for qemu-devel@nongnu.org; Thu, 18 Oct 2012 01:49:49 -0400 Received: from ozlabs.org ([203.10.76.45]:49682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOizF-0007cU-GT; Thu, 18 Oct 2012 01:49:41 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 61B372C00B1; Thu, 18 Oct 2012 16:49:34 +1100 (EST) From: David Gibson To: agraf@suse.de Date: Thu, 18 Oct 2012 16:50:35 +1100 Message-Id: <1350539437-535-14-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350539437-535-1-git-send-email-david@gibson.dropbear.id.au> References: <1350539437-535-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.10.76.45 Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 13/15] target-pcc: Convert ppcemb_tlb_t to use fixed 64-bit RPN X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Currently the ppcemb_tlb_t struct, used on a number of embedded ppc models to represent a TLB entry contains a target_phys_addr_t. That works reasonably for now, but is troublesome for saving the state, which we'll want to do in future. target_phys_addr_t is a large enough type to contain a physical address for any supported machine - and can thus, in theory at least, vary depending on what machines are enabled other than the one we're actually using right now. This makes it unsuitable for describing in vmstate. This patch therefore changes ppcemb_tlb_t to use a fixed 64-bit integer which we know is sufficient for all the machines which use this structure. Signed-off-by: David Gibson --- target-ppc/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index cde6da0..f30e0c7 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -355,7 +355,7 @@ struct ppc6xx_tlb_t { typedef struct ppcemb_tlb_t ppcemb_tlb_t; struct ppcemb_tlb_t { - target_phys_addr_t RPN; + uint64_t RPN; target_ulong EPN; target_ulong PID; target_ulong size;