[Xen-devel] [Qemu-devel] [PATCH v6 06/26] hw/intc/armv7m_nic: Access MemoryRegion with MemOp

[<tony.nguyen@xxxxxx>]

The memory_region_dispatch_{read|write} operand "unsigned size" is

being converted into a "MemOp op".

Convert interfaces by using no-op size_memop.

After all interfaces are converted, size_memop will be implemented

and the memory_region_dispatch_{read|write} operand "unsigned size"

will be converted into a "MemOp op".

As size_memop is a no-op, this patch does not change any behaviour.

Signed-off-by: Tony Nguyen <tony.nguyen@xxxxxx>

Reviewed-by: Richard Henderson <richard.henderson@xxxxxxxxxx>

---

 hw/intc/armv7m_nvic.c | 12 ++++++++----

 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c

index 9f8f0d3..237ccef 100644

--- a/hw/intc/armv7m_nvic.c

+++ b/hw/intc/armv7m_nvic.c

@@ -18,6 +18,7 @@

 #include "hw/intc/armv7m_nvic.h"

 #include "target/arm/cpu.h"

 #include "exec/exec-all.h"

+#include "exec/memop.h"

 #include "qemu/log.h"

 #include "qemu/module.h"

 #include "trace.h"

@@ -2345,7 +2346,8 @@ static MemTxResult nvic_sysreg_ns_write(void *opaque, hwaddr addr,

     if (attrs.secure) {

         /* S accesses to the alias act like NS accesses to the real region */

         attrs.secure = 0;

-        return memory_region_dispatch_write(mr, addr, value, size, attrs);

+        return memory_region_dispatch_write(mr, addr, value, size_memop(size),

+                                            attrs);

     } else {

         /* NS attrs are RAZ/WI for privileged, and BusFault for user */

         if (attrs.user) {

@@ -2364,7 +2366,8 @@ static MemTxResult nvic_sysreg_ns_read(void *opaque, hwaddr addr,

     if (attrs.secure) {

         /* S accesses to the alias act like NS accesses to the real region */

         attrs.secure = 0;

-        return memory_region_dispatch_read(mr, addr, data, size, attrs);

+        return memory_region_dispatch_read(mr, addr, data, size_memop(size),

+                                           attrs);

     } else {

         /* NS attrs are RAZ/WI for privileged, and BusFault for user */

         if (attrs.user) {

@@ -2390,7 +2393,8 @@ static MemTxResult nvic_systick_write(void *opaque, hwaddr addr,

 

     /* Direct the access to the correct systick */

     mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->systick[attrs.secure]), 0);

-    return memory_region_dispatch_write(mr, addr, value, size, attrs);

+    return memory_region_dispatch_write(mr, addr, value, size_memop(size),

+                                        attrs);

 }

 

 static MemTxResult nvic_systick_read(void *opaque, hwaddr addr,

@@ -2402,7 +2406,7 @@ static MemTxResult nvic_systick_read(void *opaque, hwaddr addr,

 

     /* Direct the access to the correct systick */

     mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->systick[attrs.secure]), 0);

-    return memory_region_dispatch_read(mr, addr, data, size, attrs);

+    return memory_region_dispatch_read(mr, addr, data, size_memop(size), attrs);

 }

 

 static const MemoryRegionOps nvic_systick_ops = {

-- 

1.8.3.1

​

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel