From 444d55907871f88276a654fc7fdc8c7db95f4b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 28 May 2013 13:28:38 +0200 Subject: cpu: Turn cpu_paging_enabled() into a CPUState hook MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Relocate assignment of x86 get_arch_id to have all hooks in one place. Reviewed-by: Jens Freimann Reviewed-by: Luiz Capitulino Signed-off-by: Andreas Färber --- target-i386/arch_memory_mapping.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'target-i386/arch_memory_mapping.c') diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c index 5096fbdf44..c5a10ec9bd 100644 --- a/target-i386/arch_memory_mapping.c +++ b/target-i386/arch_memory_mapping.c @@ -241,7 +241,7 @@ static void walk_pml4e(MemoryMappingList *list, int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env) { - if (!cpu_paging_enabled(env)) { + if (!cpu_paging_enabled(ENV_GET_CPU(env))) { /* paging is disabled */ return 0; } @@ -273,7 +273,3 @@ int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env) return 0; } -bool cpu_paging_enabled(CPUArchState *env) -{ - return env->cr[0] & CR0_PG_MASK; -} -- cgit v1.2.1