From patchwork Tue Nov 13 02:46:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 198537 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 660B02C00AE for ; Tue, 13 Nov 2012 14:40:02 +1100 (EST) Received: from localhost ([::1]:35718 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TY6WQ-0002KT-9x for incoming@patchwork.ozlabs.org; Mon, 12 Nov 2012 21:46:42 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TY6VQ-0000KP-6t for qemu-devel@nongnu.org; Mon, 12 Nov 2012 21:45:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TY6VN-0003tq-5F for qemu-devel@nongnu.org; Mon, 12 Nov 2012 21:45:40 -0500 Received: from ozlabs.org ([2402:b800:7003:1:1::1]:48057) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TY6VM-0003t2-M0 for qemu-devel@nongnu.org; Mon, 12 Nov 2012 21:45:37 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id B424F2C00BE; Tue, 13 Nov 2012 13:45:27 +1100 (EST) From: David Gibson To: agraf@suse.de Date: Tue, 13 Nov 2012 13:46:56 +1100 Message-Id: <1352774820-22804-9-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1352774820-22804-1-git-send-email-david@gibson.dropbear.id.au> References: <1352774820-22804-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2402:b800:7003:1:1::1 Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 08/12] target-ppc: 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 hwaddr. That works reasonably for now, but is troublesome for saving the state, which we'll want to do in future. hwaddr 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 (though in fact it doesn't for ppc). 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 5f1dc8b..742d4f8 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 { - hwaddr RPN; + uint64_t RPN; target_ulong EPN; target_ulong PID; target_ulong size;