[Xen-devel] [Qemu-devel] [PATCH v6 05/26] hw/s390x: 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/s390x/s390-pci-inst.c | 8 +++++---

 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c

index 0023514..0c958fc 100644

--- a/hw/s390x/s390-pci-inst.c

+++ b/hw/s390x/s390-pci-inst.c

@@ -15,6 +15,7 @@

 #include "cpu.h"

 #include "s390-pci-inst.h"

 #include "s390-pci-bus.h"

+#include "exec/memop.h"

 #include "exec/memory-internal.h"

 #include "qemu/error-report.h"

 #include "sysemu/hw_accel.h"

@@ -372,7 +373,7 @@ static MemTxResult zpci_read_bar(S390PCIBusDevice *pbdev, uint8_t pcias,

     mr = pbdev->pdev->io_regions[pcias].memory;

     mr = s390_get_subregion(mr, offset, len);

     offset -= mr->addr;

-    return memory_region_dispatch_read(mr, offset, data, len,

+    return memory_region_dispatch_read(mr, offset, data, size_memop(len),

                                        MEMTXATTRS_UNSPECIFIED);

 }

 

@@ -471,7 +472,7 @@ static MemTxResult zpci_write_bar(S390PCIBusDevice *pbdev, uint8_t pcias,

     mr = pbdev->pdev->io_regions[pcias].memory;

     mr = s390_get_subregion(mr, offset, len);

     offset -= mr->addr;

-    return memory_region_dispatch_write(mr, offset, data, len,

+    return memory_region_dispatch_write(mr, offset, data, size_memop(len),

                                         MEMTXATTRS_UNSPECIFIED);

 }

 

@@ -780,7 +781,8 @@ int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr,

 

     for (i = 0; i < len / 8; i++) {

         result = memory_region_dispatch_write(mr, offset + i * 8,

-                                              ldq_p(buffer + i * 8), 8,

+                                              ldq_p(buffer + i * 8),

+                                              size_memop(8),

                                               MEMTXATTRS_UNSPECIFIED);

         if (result != MEMTX_OK) {

             s390_program_interrupt(env, PGM_OPERAND, 6, ra);

-- 

1.8.3.1

​

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