From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNOqU-00055X-Df for qemu-devel@nongnu.org; Mon, 07 Nov 2011 08:02:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RNOqT-0007y8-60 for qemu-devel@nongnu.org; Mon, 07 Nov 2011 08:02:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53895) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNOqS-0007y3-VL for qemu-devel@nongnu.org; Mon, 07 Nov 2011 08:02:37 -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 pA7D2Y2E021002 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 7 Nov 2011 08:02:34 -0500 Date: Mon, 7 Nov 2011 15:02:29 +0200 From: Alon Levy Message-ID: <20111107130229.GG13121@garlic.tlv.redhat.com> References: <1320340914-18151-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1320340914-18151-1-git-send-email-kraxel@redhat.com> Subject: Re: [Qemu-devel] [PATCH 1.0] qxl: fix vga port initialization. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: Hans de Goede , qemu-devel@nongnu.org On Thu, Nov 03, 2011 at 06:21:54PM +0100, Gerd Hoffmann wrote: > Commit 0a039dc70096b768d3810afa50ba1d214768aaf4 broke vga modes for > qxl-vga by loosing vga_ioport_read windup. qxl needs to hook into > vga port writes only and used to realize that by letting vga_init() do > the work for both reads and writes, then overwrite the write function. > That little detail was missed while doing the conversion ... > > This patch fixes it. It also switch qxl vga ioport registration to > portio lists while being at it. Acked-by: Alon Levy > > Cc: Hans de Goede > Signed-off-by: Gerd Hoffmann > --- > hw/qxl.c | 22 +++++++++++++++++----- > 1 files changed, 17 insertions(+), 5 deletions(-) > > diff --git a/hw/qxl.c b/hw/qxl.c > index 84ffd45..41500e9 100644 > --- a/hw/qxl.c > +++ b/hw/qxl.c > @@ -896,6 +896,20 @@ static void qxl_vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) > vga_ioport_write(opaque, addr, val); > } > > +static const MemoryRegionPortio qxl_vga_portio_list[] = { > + { 0x04, 2, 1, .read = vga_ioport_read, > + .write = qxl_vga_ioport_write }, /* 3b4 */ > + { 0x0a, 1, 1, .read = vga_ioport_read, > + .write = qxl_vga_ioport_write }, /* 3ba */ > + { 0x10, 16, 1, .read = vga_ioport_read, > + .write = qxl_vga_ioport_write }, /* 3c0 */ > + { 0x24, 2, 1, .read = vga_ioport_read, > + .write = qxl_vga_ioport_write }, /* 3d4 */ > + { 0x2a, 1, 1, .read = vga_ioport_read, > + .write = qxl_vga_ioport_write }, /* 3da */ > + PORTIO_END_OF_LIST(), > +}; > + > static void qxl_add_memslot(PCIQXLDevice *d, uint32_t slot_id, uint64_t delta, > qxl_async_io async) > { > @@ -1595,6 +1609,7 @@ static int qxl_init_primary(PCIDevice *dev) > PCIQXLDevice *qxl = DO_UPCAST(PCIQXLDevice, pci, dev); > VGACommonState *vga = &qxl->vga; > ram_addr_t ram_size = msb_mask(qxl->vga.vram_size * 2 - 1); > + PortioList *qxl_vga_port_list = g_new(PortioList, 1); > > qxl->id = 0; > > @@ -1603,11 +1618,8 @@ static int qxl_init_primary(PCIDevice *dev) > } > vga_common_init(vga, ram_size); > vga_init(vga, pci_address_space(dev), pci_address_space_io(dev), false); > - register_ioport_write(0x3c0, 16, 1, qxl_vga_ioport_write, vga); > - register_ioport_write(0x3b4, 2, 1, qxl_vga_ioport_write, vga); > - register_ioport_write(0x3d4, 2, 1, qxl_vga_ioport_write, vga); > - register_ioport_write(0x3ba, 1, 1, qxl_vga_ioport_write, vga); > - register_ioport_write(0x3da, 1, 1, qxl_vga_ioport_write, vga); > + portio_list_init(qxl_vga_port_list, qxl_vga_portio_list, vga, "vga"); > + portio_list_add(qxl_vga_port_list, pci_address_space_io(dev), 0x3b0); > > vga->ds = graphic_console_init(qxl_hw_update, qxl_hw_invalidate, > qxl_hw_screen_dump, qxl_hw_text_update, qxl); > -- > 1.7.1 > >