[qemu-xen stable-4.14] hw/display/artist: Unbreak size mismatch memory accesses

[patchbot@xxxxxxx]

commit 045849b0785d5cf3359ea03f3445a55836b0d7a8
Author:     Helge Deller <deller@xxxxxx>
AuthorDate: Sat Aug 8 22:29:01 2020 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Wed Sep 2 19:06:19 2020 -0500

    hw/display/artist: Unbreak size mismatch memory accesses
    
    Commit 5d971f9e6725 ("memory: Revert "memory: accept mismatching sizes
    in memory_region_access_valid") broke the artist driver in a way that
    the dtwm window manager on HP-UX rendered wrong.
    
    Fixes: 5d971f9e6725 ("memory: Revert "memory: accept mismatching sizes in 
memory_region_access_valid")
    Signed-off-by: Sven Schnelle <svens@xxxxxxxxxxxxxx>
    Signed-off-by: Helge Deller <deller@xxxxxx>
    (cherry picked from commit e0cf02ce680f11893aca9642e76d6ae68b9375af)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 hw/display/artist.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/hw/display/artist.c b/hw/display/artist.c
index 753dbb9a77..d7bce918b8 100644
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -1199,20 +1199,16 @@ static const MemoryRegionOps artist_reg_ops = {
     .read = artist_reg_read,
     .write = artist_reg_write,
     .endianness = DEVICE_NATIVE_ENDIAN,
-    .valid = {
-        .min_access_size = 1,
-        .max_access_size = 4,
-    },
+    .impl.min_access_size = 1,
+    .impl.max_access_size = 4,
 };
 
 static const MemoryRegionOps artist_vram_ops = {
     .read = artist_vram_read,
     .write = artist_vram_write,
     .endianness = DEVICE_NATIVE_ENDIAN,
-    .valid = {
-        .min_access_size = 1,
-        .max_access_size = 4,
-    },
+    .impl.min_access_size = 1,
+    .impl.max_access_size = 4,
 };
 
 static void artist_draw_cursor(ARTISTState *s)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.14