diff mbox

[for-1.6] adlib: sort offsets in portio registration

Message ID 1376473744-18435-1-git-send-email-hpoussin@reactos.org
State New
Headers show

Commit Message

Hervé Poussineau Aug. 14, 2013, 9:49 a.m. UTC 
This fixes the following assert when -device adlib is used:
ioport.c:240: portio_list_add: Assertion `pio->offset >= off_last' failed.

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/audio/adlib.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Hervé Poussineau Aug. 18, 2013, 8:05 p.m. UTC | #1 
Ping.

CCing stable too.

Hervé

Hervé Poussineau a écrit :
> This fixes the following assert when -device adlib is used:
> ioport.c:240: portio_list_add: Assertion `pio->offset >= off_last' failed.
> 
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  hw/audio/adlib.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
> index 0421d47..db4a953 100644
> --- a/hw/audio/adlib.c
> +++ b/hw/audio/adlib.c
> @@ -284,9 +284,9 @@ static void Adlib_fini (AdlibState *s)
>  }
>  
>  static MemoryRegionPortio adlib_portio_list[] = {
> -    { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },
>      { 0, 4, 1, .read = adlib_read, .write = adlib_write, },
>      { 0, 2, 1, .read = adlib_read, .write = adlib_write, },
> +    { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },
>      PORTIO_END_OF_LIST(),
>  };
>
Paolo Bonzini Aug. 30, 2013, 3:45 p.m. UTC | #2 
Il 14/08/2013 11:49, Hervé Poussineau ha scritto:
> This fixes the following assert when -device adlib is used:
> ioport.c:240: portio_list_add: Assertion `pio->offset >= off_last' failed.
> 
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  hw/audio/adlib.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
> index 0421d47..db4a953 100644
> --- a/hw/audio/adlib.c
> +++ b/hw/audio/adlib.c
> @@ -284,9 +284,9 @@ static void Adlib_fini (AdlibState *s)
>  }
>  
>  static MemoryRegionPortio adlib_portio_list[] = {
> -    { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },
>      { 0, 4, 1, .read = adlib_read, .write = adlib_write, },
>      { 0, 2, 1, .read = adlib_read, .write = adlib_write, },
> +    { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },
>      PORTIO_END_OF_LIST(),
>  };
>  
> 

Ping, and Cc to qemu-stable
Michael Tokarev Sept. 1, 2013, 4:01 p.m. UTC | #3 
14.08.2013 13:49, Hervé Poussineau wrote:
> This fixes the following assert when -device adlib is used:
> ioport.c:240: portio_list_add: Assertion `pio->offset >= off_last' failed.

Thanks, applied to the trivial-patches queue.

/mjt
diff mbox

Patch

diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 0421d47..db4a953 100644
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -284,9 +284,9 @@  static void Adlib_fini (AdlibState *s)
 }
 
 static MemoryRegionPortio adlib_portio_list[] = {
-    { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },
     { 0, 4, 1, .read = adlib_read, .write = adlib_write, },
     { 0, 2, 1, .read = adlib_read, .write = adlib_write, },
+    { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },
     PORTIO_END_OF_LIST(),
 };