From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbxVM-0001xY-TX for qemu-devel@nongnu.org; Tue, 05 Jun 2012 13:25:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbxVD-0000z3-26 for qemu-devel@nongnu.org; Tue, 05 Jun 2012 13:25:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11820) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbxVC-0000xt-RB for qemu-devel@nongnu.org; Tue, 05 Jun 2012 13:25:07 -0400 From: Luiz Capitulino Date: Tue, 5 Jun 2012 14:24:43 -0300 Message-Id: <1338917108-3965-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1338917108-3965-1-git-send-email-lcapitulino@redhat.com> References: <1338917108-3965-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 04/29] Add API to check whether paging mode is enabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com From: Wen Congyang This API will be used in the following patch. Signed-off-by: Wen Congyang Signed-off-by: Luiz Capitulino --- cpu-all.h | 6 ++++++ target-i386/arch_memory_mapping.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cpu-all.h b/cpu-all.h index 2688bac..76439b4 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -527,12 +527,18 @@ int cpu_memory_rw_debug(CPUArchState *env, target_ulong addr, #if defined(CONFIG_HAVE_GET_MEMORY_MAPPING) int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env); +bool cpu_paging_enabled(CPUArchState *env); #else static inline int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env) { return -1; } + +static inline bool cpu_paging_enabled(CPUArchState *env) +{ + return true; +} #endif #endif /* CPU_ALL_H */ diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c index dd64bec..bd50e11 100644 --- a/target-i386/arch_memory_mapping.c +++ b/target-i386/arch_memory_mapping.c @@ -233,7 +233,7 @@ static void walk_pml4e(MemoryMappingList *list, int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env) { - if (!(env->cr[0] & CR0_PG_MASK)) { + if (!cpu_paging_enabled(env)) { /* paging is disabled */ return 0; } @@ -264,3 +264,8 @@ int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env) return 0; } + +bool cpu_paging_enabled(CPUArchState *env) +{ + return env->cr[0] & CR0_PG_MASK; +} -- 1.7.10.2.565.gbd578b5