summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorHervé Poussineau <hpoussin@reactos.org>2013-08-14 11:49:04 +0200
committerMichael Roth <mdroth@linux.vnet.ibm.com>2013-09-24 22:11:51 -0500
commit2ffbe03e8bc8f330581e31537190949a9aba80c3 (patch)
treec1c078c946dc80c65d08612c55e8c758d550260b /hw
parentf9fd82ee939d6ee5bff126b125020021e18ce330 (diff)
downloadqemu-2ffbe03e8bc8f330581e31537190949a9aba80c3.tar.gz
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 <hpoussin@reactos.org> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> (cherry picked from commit 2b21fb57af305f17841d79e7e2e02ad1aec3f5ca) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/audio/adlib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 0421d473ff..db4a953cf5 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(),
};