From patchwork Sun Sep 18 12:44:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 115235 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [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 0B1E6B6FA0 for ; Sun, 18 Sep 2011 22:44:54 +1000 (EST) Received: from localhost ([::1]:60139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5Gjo-0006HP-RA for incoming@patchwork.ozlabs.org; Sun, 18 Sep 2011 08:44:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5Gjg-000677-57 for qemu-devel@nongnu.org; Sun, 18 Sep 2011 08:44:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5Gje-00069n-V8 for qemu-devel@nongnu.org; Sun, 18 Sep 2011 08:44:39 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:35825) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5Gje-00069h-KR for qemu-devel@nongnu.org; Sun, 18 Sep 2011 08:44:38 -0400 Received: from smtp02.web.de ( [172.20.0.184]) by fmmailgate02.web.de (Postfix) with ESMTP id CB2C21AB45961; Sun, 18 Sep 2011 14:44:32 +0200 (CEST) Received: from [88.65.36.224] (helo=mchn199C.mchp.siemens.de) by smtp02.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1R5GjY-0007ap-00; Sun, 18 Sep 2011 14:44:32 +0200 Message-ID: <4E75E7B0.9080104@web.de> Date: Sun, 18 Sep 2011 14:44:32 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity X-Enigmail-Version: 1.3.1 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX189mopgcCsKpGXs4+3b7sMZR6/rKzfuvNBja5FC G/wIFXQzCdXeu/9gWMr/uAaIF6fEdH1S0D14f7dX40cnBwzmpL sKpJm4gk4= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.227 Cc: qemu-devel , Richard Henderson Subject: [Qemu-devel] [PATCH 2/2] vga: Fix portio list conversion fallouts 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: Jan Kiszka Fix copy&paste errors and reduce duplications of the BOCHS VBE ranges. Signed-off-by: Jan Kiszka --- This and the previous patch unbreaks VGA over memory/master. hw/vga.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/vga.c b/hw/vga.c index 513a5f6..22160e8 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2244,19 +2244,18 @@ static const MemoryRegionPortio vga_portio_list[] = { { 0x04, 2, 1, .read = vga_ioport_read, .write = vga_ioport_write }, /* 3b4 */ { 0x0a, 1, 1, .read = vga_ioport_read, .write = vga_ioport_write }, /* 3ba */ { 0x10, 16, 1, .read = vga_ioport_read, .write = vga_ioport_write }, /* 3c0 */ - { 0x14, 2, 1, .read = vga_ioport_read, .write = vga_ioport_write }, /* 3d4 */ - { 0x1a, 1, 1, .read = vga_ioport_read, .write = vga_ioport_write }, /* 3da */ + { 0x24, 2, 1, .read = vga_ioport_read, .write = vga_ioport_write }, /* 3d4 */ + { 0x2a, 1, 1, .read = vga_ioport_read, .write = vga_ioport_write }, /* 3da */ PORTIO_END_OF_LIST(), }; #ifdef CONFIG_BOCHS_VBE static const MemoryRegionPortio vbe_portio_list[] = { -# ifdef TARGET_I386 { 0, 1, 2, .read = vbe_ioport_read_index, .write = vbe_ioport_write_index }, +# ifdef TARGET_I386 { 1, 1, 2, .read = vbe_ioport_read_data, .write = vbe_ioport_write_data }, # else - { 0, 2, 2, .read = vbe_ioport_read_index, .write = vbe_ioport_write_index }, - { 2, 2, 2, .read = vbe_ioport_read_data, .write = vbe_ioport_write_data }, + { 2, 1, 2, .read = vbe_ioport_read_data, .write = vbe_ioport_write_data }, # endif PORTIO_END_OF_LIST(), };