From mboxrd@z Thu Jan 1 00:00:00 1970 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 Message-ID: <4E75E7B0.9080104@web.de> Date: Sun, 18 Sep 2011 14:44:32 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH 2/2] vga: Fix portio list conversion fallouts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: qemu-devel , Richard Henderson 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(), };