From patchwork Wed Jun 10 09:21:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 482564 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 07801140295 for ; Wed, 10 Jun 2015 19:23:44 +1000 (AEST) Received: from localhost ([::1]:38555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2cEX-0004lx-T0 for incoming@patchwork.ozlabs.org; Wed, 10 Jun 2015 05:23:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2cCZ-00019z-K5 for qemu-devel@nongnu.org; Wed, 10 Jun 2015 05:21:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2cCT-0002n0-TP for qemu-devel@nongnu.org; Wed, 10 Jun 2015 05:21:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2cCT-0002mb-O2 for qemu-devel@nongnu.org; Wed, 10 Jun 2015 05:21:33 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 22086293205 for ; Wed, 10 Jun 2015 09:21:33 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-61.ams2.redhat.com [10.36.116.61]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5A9LVpT014767; Wed, 10 Jun 2015 05:21:32 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id CE9F280E53; Wed, 10 Jun 2015 11:21:28 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 10 Jun 2015 11:21:22 +0200 Message-Id: <1433928086-2650-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1433928086-2650-1-git-send-email-kraxel@redhat.com> References: <1433928086-2650-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PULL 1/5] stdvga: fix offset in pci_vga_ioport_read 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 Simliar to pci_vga_ioport_write. Signed-off-by: Gerd Hoffmann --- hw/display/vga-pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index ff5dfb2..93c8b5d 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -81,11 +81,11 @@ static uint64_t pci_vga_ioport_read(void *ptr, hwaddr addr, switch (size) { case 1: - ret = vga_ioport_read(&d->vga, addr); + ret = vga_ioport_read(&d->vga, addr + 0x3c0); break; case 2: - ret = vga_ioport_read(&d->vga, addr); - ret |= vga_ioport_read(&d->vga, addr+1) << 8; + ret = vga_ioport_read(&d->vga, addr + 0x3c0); + ret |= vga_ioport_read(&d->vga, addr + 0x3c1) << 8; break; } return ret;