From patchwork Wed Aug 14 09:49:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 267010 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BBACB2C019B for ; Wed, 14 Aug 2013 19:48:24 +1000 (EST) Received: from localhost ([::1]:36569 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9Xgk-0003kk-94 for incoming@patchwork.ozlabs.org; Wed, 14 Aug 2013 05:48:22 -0400 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 Received: from smtp1-g21.free.fr ([2a01:e0c:1:1599::10]:34995) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9XgK-000075-2w; Wed, 14 Aug 2013 05:47:56 -0400 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp1-g21.free.fr (Postfix) with ESMTP id 4B7C494016F; Wed, 14 Aug 2013 11:47:49 +0200 (CEST) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Wed, 14 Aug 2013 11:49:04 +0200 Message-Id: <1376473744-18435-1-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:e0c:1:1599::10 Cc: qemu-trivial@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , aliguori@us.ibm.com, av1474@comtv.ru Subject: [Qemu-devel] [PATCH for-1.6] adlib: sort offsets in portio registration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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) } 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(), };