From patchwork Thu Oct 4 09:38:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2] s390: avoid reaching into memory core internals From: Avi Kivity X-Patchwork-Id: 189080 Message-Id: <1349343514-19063-1-git-send-email-avi@redhat.com> To: Blue Swirl Cc: Christian Borntraeger , qemu-devel@nongnu.org Date: Thu, 4 Oct 2012 11:38:34 +0200 use cpu_physical_memory_is_io() instead. Signed-off-by: Avi Kivity --- v2: drop unnecessary #include 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) {