[Xen-changelog] [qemu-upstream-unstable] adlib: sort offsets in portio registration

[patchbot@xxxxxxx]

commit 2ffbe03e8bc8f330581e31537190949a9aba80c3
Author:     Hervé Poussineau <hpoussin@xxxxxxxxxxx>
AuthorDate: Wed Aug 14 11:49:04 2013 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Tue Sep 24 22:11:51 2013 -0500

    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@xxxxxxxxxxx>
    Signed-off-by: Michael Tokarev <mjt@xxxxxxxxxx>
    (cherry picked from commit 2b21fb57af305f17841d79e7e2e02ad1aec3f5ca)
    
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 hw/audio/adlib.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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(),
 };
 
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog