From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLcln-0006a7-VE for qemu-devel@nongnu.org; Tue, 09 Oct 2012 12:35:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TLclK-0000Af-TG for qemu-devel@nongnu.org; Tue, 09 Oct 2012 12:34:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLclJ-00009J-U0 for qemu-devel@nongnu.org; Tue, 09 Oct 2012 12:34:30 -0400 From: Avi Kivity Date: Tue, 9 Oct 2012 18:32:43 +0200 Message-Id: <1349800368-15228-19-git-send-email-avi@redhat.com> In-Reply-To: <1349800368-15228-1-git-send-email-avi@redhat.com> References: <1349800368-15228-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH v3 18/23] s390: avoid reaching into memory core internals List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori , liu ping fan , "Michael S. Tsirkin" , Paolo Bonzini , Blue Swirl use cpu_physical_memory_is_io() instead. Signed-off-by: Avi Kivity --- target-s390x/misc_helper.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index e9b3cae..fdccd58 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -20,7 +20,6 @@ #include "cpu.h" #include "memory.h" -#include "cputlb.h" #include "host-utils.h" #include "helper.h" #include @@ -81,7 +80,7 @@ int sclp_service_call(CPUS390XState *env, uint32_t sccb, uint64_t code) #endif /* basic checks */ - if (!memory_region_is_ram(phys_page_find(sccb >> TARGET_PAGE_BITS)->mr)) { + if (cpu_physical_memory_is_io(sccb)) { return -PGM_ADDRESSING; } if (sccb & ~0x7ffffff8ul) { -- 1.7.12