From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGOch-0007Yj-1U for qemu-devel@nongnu.org; Sat, 18 Jul 2015 05:41:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZGOcg-0004fY-4k for qemu-devel@nongnu.org; Sat, 18 Jul 2015 05:41:34 -0400 Received: from mail-pa0-x230.google.com ([2607:f8b0:400e:c03::230]:34470) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGOcf-0004fS-VE for qemu-devel@nongnu.org; Sat, 18 Jul 2015 05:41:34 -0400 Received: by pacan13 with SMTP id an13so74120535pac.1 for ; Sat, 18 Jul 2015 02:41:33 -0700 (PDT) From: Peter Crosthwaite Date: Sat, 18 Jul 2015 02:40:24 -0700 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v3 14/35] cpu-common: Define tb_page_addr_t for everyone List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Peter Crosthwaite , edgar.iglesias@gmail.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net In system mode emulation (at least) this definition has no architecture specific dependencies. Move it to common code such that common code can use it (primarily for defining function prototypes). Signed-off-by: Peter Crosthwaite --- So this is the same as in RFCv2 and the comment there was that it will not work for linux-user mode WRT to qom/cpu.h fn prototypes needed this def. But the solution there is intead conditionalise the def of those hooks on NEED_CPU_H. Then this patch is just needed for some misc. system-mode-only core code usages. --- include/exec/cpu-common.h | 4 ++++ include/exec/exec-all.h | 2 -- include/qom/cpu.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 9fb1d54..47d416d 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -53,6 +53,10 @@ typedef uintptr_t ram_addr_t; # define RAM_ADDR_FMT "%" PRIxPTR #endif +#ifndef CONFIG_USER_ONLY +typedef ram_addr_t tb_page_addr_t; +#endif + extern ram_addr_t ram_size; ram_addr_t get_current_ram_size(void); diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index cc19fc3..8fd0540 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -30,8 +30,6 @@ type. */ #if defined(CONFIG_USER_ONLY) typedef abi_ulong tb_page_addr_t; -#else -typedef ram_addr_t tb_page_addr_t; #endif /* is_jmp field values */ diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 0815ed5..eb12d26 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -24,6 +24,7 @@ #include #include "hw/qdev-core.h" #include "disas/bfd.h" +#include "exec/cpu-common.h" #include "exec/hwaddr.h" #include "exec/memattrs.h" #include "qemu/queue.h" -- 1.9.1