[qemu-s390x] [Qemu-devel] [PATCH v4 06/15] hw/virtio: Access MemoryRegion with MemOp

[tony.nguyen]

Signed-off-by: Tony Nguyen <address@hidden>

---

 hw/virtio/virtio-pci.c | 7 +++++--

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

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c

index ce928f2..265f066 100644

--- a/hw/virtio/virtio-pci.c

+++ b/hw/virtio/virtio-pci.c

@@ -17,6 +17,7 @@

 

 #include "qemu/osdep.h"

 

+#include "exec/memop.h"

 #include "standard-headers/linux/virtio_pci.h"

 #include "hw/virtio/virtio.h"

 #include "hw/pci/pci.h"

@@ -550,7 +551,8 @@ void virtio_address_space_write(VirtIOPCIProxy *proxy, hwaddr addr,

         /* As length is under guest control, handle illegal values. */

         return;

     }

-    memory_region_dispatch_write(mr, addr, val, len, MEMTXATTRS_UNSPECIFIED);

+    memory_region_dispatch_write(mr, addr, val, SIZE_MEMOP(len),

+                                 MEMTXATTRS_UNSPECIFIED);

 }

 

 static void

@@ -573,7 +575,8 @@ virtio_address_space_read(VirtIOPCIProxy *proxy, hwaddr addr,

     /* Make sure caller aligned buf properly */

     assert(!(((uintptr_t)buf) & (len - 1)));

 

-    memory_region_dispatch_read(mr, addr, &val, len, MEMTXATTRS_UNSPECIFIED);

+    memory_region_dispatch_read(mr, addr, &val, SIZE_MEMOP(len),

+                                MEMTXATTRS_UNSPECIFIED);

     switch (len) {

     case 1:

         pci_set_byte(buf, val);

-- 

1.8.3.1