Skip to contentSkip to conversation

adlib: sort offsets in portio registration

PATCH Applied Hervé Poussineau 3 participants 4 messages Aug 14, 2013 – Sep 1, 2013

lore
Share & tools
lore

Hervé Poussineau

author
#0 lore raw

PATCH 1/1 adlib: sort offsets in portio registration

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 <[email protected]>
---
 hw/audio/adlib.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/audio/adlib.c +1 -1
index 0421d47..db4a953 100644
@@ -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(),
 };
Signature · 1 line
1.7.10.4
author
#1 lore raw

Ping.

CCing stable too.

Hervé

Quoted 23 lines · Hervé Poussineau

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 <[email protected]>
---
 hw/audio/adlib.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/audio/adlib.c +1 -1
index 0421d47..db4a953 100644
@@ -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(),
 };
#2 lore raw

[Qemu-devel] PING Re: [PATCH for-1.6] adlib: sort offsets in portio registration

In reply to Hervé Poussineau

Il 14/08/2013 11:49, Hervé Poussineau ha scritto:

Quoted 14 lines

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 <[email protected]>
---
 hw/audio/adlib.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/audio/adlib.c +0 -0
index 0421d47..db4a953 100644

hw/audio/adlib.c static void Adlib_fini (AdlibState *s) · line 292

Quoted 10 lines
hw/audio/adlib.c +1 -1
@@ -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

Applied
#3 lore raw
In reply to Hervé Poussineau
Quoted 2 lines · Hervé Poussineau

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