From patchwork Wed Sep 25 12:57:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 277833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 842842C00B1 for ; Wed, 25 Sep 2013 23:02:03 +1000 (EST) Received: from localhost ([::1]:52392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOojB-0007bd-DM for incoming@patchwork.ozlabs.org; Wed, 25 Sep 2013 09:02:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOog6-0003I9-6A for qemu-devel@nongnu.org; Wed, 25 Sep 2013 08:58:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOog0-0000Dq-3F for qemu-devel@nongnu.org; Wed, 25 Sep 2013 08:58:50 -0400 Received: from mail-qe0-x236.google.com ([2607:f8b0:400d:c02::236]:48030) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOofz-0000Df-MJ; Wed, 25 Sep 2013 08:58:43 -0400 Received: by mail-qe0-f54.google.com with SMTP id cy11so4182727qeb.27 for ; Wed, 25 Sep 2013 05:58:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=HiCCKNiSE0y3iw+bljbu9l1LjYZTPoC9XGu4mlcEOVE=; b=ig8dmylTvrHH4W0n2+Q2YMqPd8IPDoS/uHuh/S4ZOHQb7mklhI9BzTbVSkJjlWaXAQ D7mxq0VGqMYAKDSD286KAYmI4sJABONXeSM0GqncxnauHLktoNpQxZL/SCNRQgSt5Yxo MnwnulAW6CreYCQHwcuDvakfHdAGr8cKUDjDLp4LOdrzmZyl7TX+IOcxmVvKgBntxLbK 10GhrKeF92mDoC3t0rG4o8dnvG9KYMNcSZsLaq3rjkZukn4aGKaELp5aKi1vZ46DkRbb kPcl5GNVLtfv6APWiugzYjsnn50B4KdAKgwjGXS40ctgS1AChgNkG7Mc1bC5Ki1iKvKX nFmQ== X-Received: by 10.229.48.137 with SMTP id r9mr44673359qcf.6.1380113923242; Wed, 25 Sep 2013 05:58:43 -0700 (PDT) Received: from loki.morrigu.org ([70.114.130.150]) by mx.google.com with ESMTPSA id g2sm65250216qaf.12.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 05:58:42 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 25 Sep 2013 07:57:43 -0500 Message-Id: <1380113886-16845-16-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380113886-16845-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1380113886-16845-1-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c02::236 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 15/38] 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 From: Hervé Poussineau 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 Signed-off-by: Michael Tokarev (cherry picked from commit 2b21fb57af305f17841d79e7e2e02ad1aec3f5ca) Signed-off-by: Michael Roth --- 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(), };