aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2012-10-03 16:14:23 +0200
committerAvi Kivity <avi@redhat.com>2012-10-22 14:50:07 +0200
commit0e8a6d47afcc88564079387928f2da45736d36e8 (patch)
treef65a3142490de9f2a5f88ea98cacc99e17c6745e
parentf6790af6bcfa35fa9ea3c565a0a2aed54337aef5 (diff)
s390: avoid reaching into memory core internals
use cpu_physical_memory_is_io() instead. Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--target-s390x/misc_helper.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index e9b3caed49..fdccd58e3d 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 <string.h>
@@ -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) {