[qemu-xen staging-4.14] hw/audio/gus: Fix registers 32-bit access

[patchbot@xxxxxxx]

commit 7a1f17a51e091507f7a645db6720fc8d832d7c3c
Author:     Allan Peramaki <aperamak@xxxxxxxxxxx>
AuthorDate: Thu Jun 18 12:36:23 2020 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Wed Sep 2 19:06:19 2020 -0500

    hw/audio/gus: Fix registers 32-bit access
    
    Fix audio on software that accesses DRAM above 64k via register
    peek/poke and some cases when more than 16 voices are used.
    
    Cc: qemu-stable@xxxxxxxxxx
    Fixes: 135f5ae1974c ("audio: GUSsample is int16_t")
    Signed-off-by: Allan Peramaki <aperamak@xxxxxxxxxxx>
    Tested-by: Volker Rümelin <vr_qemu@xxxxxxxxxxx>
    Reviewed-by: Volker Rümelin <vr_qemu@xxxxxxxxxxx>
    Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx>
    Reviewed-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
    Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
    Message-id: 20200618103623.6031-1-philmd@xxxxxxxxxx
    Message-Id: <20200615201757.16868-1-aperamak@xxxxxxxxxxx>
    [PMD: Removed unrelated style changes]
    Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
    Signed-off-by: Gerd Hoffmann <kraxel@xxxxxxxxxx>
    (cherry picked from commit 586803455b3fa44d949ecd42cd9c87e5a6287aef)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 hw/audio/gusemu_hal.c   | 2 +-
 hw/audio/gusemu_mixer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/audio/gusemu_hal.c b/hw/audio/gusemu_hal.c
index ae40ca341c..5b9a14ee21 100644
--- a/hw/audio/gusemu_hal.c
+++ b/hw/audio/gusemu_hal.c
@@ -32,7 +32,7 @@
 
 #define GUSregb(position) (*            (gusptr+(position)))
 #define GUSregw(position) (*(uint16_t *) (gusptr+(position)))
-#define GUSregd(position) (*(uint16_t *)(gusptr+(position)))
+#define GUSregd(position) (*(uint32_t *)(gusptr + (position)))
 
 /* size given in bytes */
 unsigned int gus_read(GUSEmuState * state, int port, int size)
diff --git a/hw/audio/gusemu_mixer.c b/hw/audio/gusemu_mixer.c
index 00b9861b92..56300de77e 100644
--- a/hw/audio/gusemu_mixer.c
+++ b/hw/audio/gusemu_mixer.c
@@ -28,7 +28,7 @@
 
 #define GUSregb(position)  (*            (gusptr+(position)))
 #define GUSregw(position)  (*(uint16_t *) (gusptr+(position)))
-#define GUSregd(position)  (*(uint16_t *)(gusptr+(position)))
+#define GUSregd(position)  (*(uint32_t *)(gusptr + (position)))
 
 #define GUSvoice(position) (*(uint16_t *)(voiceptr+(position)))
 
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging-4.14