From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9XgQ-0003gU-5M for qemu-devel@nongnu.org; Wed, 14 Aug 2013 05:48:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V9XgK-00008p-KE for qemu-devel@nongnu.org; Wed, 14 Aug 2013 05:48:02 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Wed, 14 Aug 2013 11:49:04 +0200 Message-Id: <1376473744-18435-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-1.6] adlib: sort offsets in portio registration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , aliguori@us.ibm.com, av1474@comtv.ru This fixes the following assert when -device adlib is used: ioport.c:240: portio_list_add: Assertion `pio->offset >=3D off_last' fail= ed. Signed-off-by: Herv=C3=A9 Poussineau --- 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) } =20 static MemoryRegionPortio adlib_portio_list[] =3D { - { 0x388, 4, 1, .read =3D adlib_read, .write =3D adlib_write, }, { 0, 4, 1, .read =3D adlib_read, .write =3D adlib_write, }, { 0, 2, 1, .read =3D adlib_read, .write =3D adlib_write, }, + { 0x388, 4, 1, .read =3D adlib_read, .write =3D adlib_write, }, PORTIO_END_OF_LIST(), }; =20 --=20 1.7.10.4