From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54384) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbAfq-0003pU-Ds for qemu-devel@nongnu.org; Wed, 21 Nov 2012 08:49:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TbAfk-0000Lm-0h for qemu-devel@nongnu.org; Wed, 21 Nov 2012 08:49:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34705) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbAfj-0000LO-OO for qemu-devel@nongnu.org; Wed, 21 Nov 2012 08:48:59 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qALDmw7A017024 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 21 Nov 2012 08:48:58 -0500 From: Gerd Hoffmann Date: Wed, 21 Nov 2012 14:48:54 +0100 Message-Id: <1353505736-26577-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1353505736-26577-1-git-send-email-kraxel@redhat.com> References: <1353505736-26577-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] vga: fix bochs alignment issue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann The bochs dispi interface traditionally uses port 0x1ce as 16bit index register and port 0x1cf as 16bit data register. The later is unaligned, and probably for that reason the the data register was moved to 0x1d0 for non-x86 archs. This patch makes the data register available at 0x1d0 on x86 too. The old x86 location is kept for compatibility reasons, so both 0x1cf and 0x1d0 can be used as data register on x86. Signed-off-by: Gerd Hoffmann --- docs/specs/standard-vga.txt | 3 ++- hw/vga.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/specs/standard-vga.txt b/docs/specs/standard-vga.txt index 1cecccd..8a4c1e9 100644 --- a/docs/specs/standard-vga.txt +++ b/docs/specs/standard-vga.txt @@ -36,7 +36,8 @@ IO ports used 03c0 - 03df : standard vga ports 01ce : bochs vbe interface index port -01cf : bochs vbe interface data port +01cf : bochs vbe interface data port (x86 only) +01d0 : bochs vbe interface data port Memory regions used diff --git a/hw/vga.c b/hw/vga.c index 81aa76b..2b0200a 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2321,9 +2321,8 @@ static const MemoryRegionPortio vbe_portio_list[] = { { 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 - { 2, 1, 2, .read = vbe_ioport_read_data, .write = vbe_ioport_write_data }, # endif + { 2, 1, 2, .read = vbe_ioport_read_data, .write = vbe_ioport_write_data }, PORTIO_END_OF_LIST(), }; -- 1.7.1