Patchwork [RFC,v1,18/22] s390: avoid reaching into memory core internals

login
register
mail settings
Submitter Avi Kivity
Date Oct. 3, 2012, 4:04 p.m.
Message ID <1349280245-16341-19-git-send-email-avi@redhat.com>
Download mbox | patch
Permalink /patch/188856/
State New
Headers show

Comments

Avi Kivity - Oct. 3, 2012, 4:04 p.m.
use cpu_physical_memory_is_io() instead.

Signed-off-by: Avi Kivity <avi@redhat.com>
---
 target-s390x/misc_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Christian Borntraeger - Oct. 4, 2012, 8:12 a.m.
On 03/10/12 18:04, Avi Kivity wrote:
> use cpu_physical_memory_is_io() instead.
> 
> Signed-off-by: Avi Kivity <avi@redhat.com>
> ---
>  target-s390x/misc_helper.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
> index e9b3cae..2da4c90 100644
> --- a/target-s390x/misc_helper.c
> +++ b/target-s390x/misc_helper.c
> @@ -81,7 +81,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) {
> 

You can then probably also remove the #include "cputlb.h"

As a heads up: We have some patches pending that move that code. 
see https://lists.gnu.org/archive/html/qemu-devel/2012-10/msg00121.html

So let us know if we should refresh the patch - otherwise we will let
that be resolved by the person that merges the commit. (will be a merge
conflict)

Christian

Patch

diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index e9b3cae..2da4c90 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -81,7 +81,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) {