s390: avoid reaching into memory core internals

use cpu_physical_memory_is_io() instead.

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2012-10-03 16:14:23 +02:00
parent f6790af6bc
commit 0e8a6d47af

View file

@ -20,7 +20,6 @@
#include "cpu.h" #include "cpu.h"
#include "memory.h" #include "memory.h"
#include "cputlb.h"
#include "host-utils.h" #include "host-utils.h"
#include "helper.h" #include "helper.h"
#include <string.h> #include <string.h>
@ -81,7 +80,7 @@ int sclp_service_call(CPUS390XState *env, uint32_t sccb, uint64_t code)
#endif #endif
/* basic checks */ /* 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; return -PGM_ADDRESSING;
} }
if (sccb & ~0x7ffffff8ul) { if (sccb & ~0x7ffffff8ul) {