From patchwork Tue Apr 12 05:13:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 90705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 60146B6F0C for ; Tue, 12 Apr 2011 15:14:57 +1000 (EST) Received: from localhost ([::1]:46373 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9VwE-0007Zt-DZ for incoming@patchwork.ozlabs.org; Tue, 12 Apr 2011 01:14:54 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50801) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9Vw5-0007YG-Fs for qemu-devel@nongnu.org; Tue, 12 Apr 2011 01:14:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q9Vw4-0005uZ-I3 for qemu-devel@nongnu.org; Tue, 12 Apr 2011 01:14:45 -0400 Received: from [222.73.24.84] (port=50299 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9Vw4-0005pV-9R for qemu-devel@nongnu.org; Tue, 12 Apr 2011 01:14:44 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 240FF170124; Tue, 12 Apr 2011 13:14:36 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p3C58DdS008230; Tue, 12 Apr 2011 13:08:13 +0800 Received: from [10.167.225.226] ([10.167.225.226]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011041213151551-35999 ; Tue, 12 Apr 2011 13:15:15 +0800 Message-ID: <4DA3DF6B.8010308@cn.fujitsu.com> Date: Tue, 12 Apr 2011 13:13:15 +0800 From: Wen Congyang User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: Isaku Yamahata , Aurelien Jarno , qemu-devel , blauwirbel@gmail.com X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-04-12 13:15:15, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-04-12 13:15:15, Serialize complete at 2011-04-12 13:15:15 X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1) X-Received-From: 222.73.24.84 Subject: [Qemu-devel] [PATCH] fix acpi regression 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 bug is introduced by commit 23910d3f. Signed-off-by: Wen Congyang --- hw/acpi.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/acpi.c b/hw/acpi.c index e372474..790bd3b 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -355,7 +355,7 @@ static uint8_t *acpi_gpe_ioport_get_ptr(ACPIGPE *gpe, uint32_t addr) if (addr < gpe->len / 2) { cur = gpe->sts + addr; } else if (addr < gpe->len) { - cur = gpe->en + addr; + cur = gpe->en + addr - gpe->len / 2; } else { abort(); } @@ -369,12 +369,8 @@ void acpi_gpe_ioport_writeb(ACPIGPE *gpe, uint32_t addr, uint32_t val) addr -= gpe->blk; cur = acpi_gpe_ioport_get_ptr(gpe, addr); - if (addr < gpe->len / 2) { - /* GPE_STS */ - *cur = (*cur) & ~val; - } else if (addr < gpe->len) { - /* GPE_EN */ - *cur = val; + if (cur != NULL) { + *cur = val & 0xff; } else { abort(); }