From: Hervé Poussineau <hpoussin@reactos.org>
Date: Wed, 14 Aug 2013 09:49:04 +0000 (+0200)
Subject: adlib: sort offsets in portio registration
X-Git-Tag: qemu-xen-4.4.0-rc1~1^2~34
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2ffbe03e8bc8f330581e31537190949a9aba80c3;p=qemu-upstream-4.4-testing.git

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>
---

diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 0421d473f..db4a953cf 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(),
 };