From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNpRA-0004Ah-3M for qemu-devel@nongnu.org; Tue, 08 Nov 2011 12:26:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RNpR4-0000kM-2N for qemu-devel@nongnu.org; Tue, 08 Nov 2011 12:26:15 -0500 Received: from mail-gy0-f173.google.com ([209.85.160.173]:50067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNpR3-0000kI-W2 for qemu-devel@nongnu.org; Tue, 08 Nov 2011 12:26:10 -0500 Received: by gyb11 with SMTP id 11so874716gyb.4 for ; Tue, 08 Nov 2011 09:26:09 -0800 (PST) Message-ID: <4EB965D9.8070600@redhat.com> Date: Tue, 08 Nov 2011 11:24:41 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1320340914-18151-1-git-send-email-kraxel@redhat.com> In-Reply-To: <1320340914-18151-1-git-send-email-kraxel@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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 11/03/2011 12:21 PM, 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. > > Cc: Hans de Goede > Signed-off-by: Gerd Hoffmann Applied. Thanks. Regards, Anthony Liguori > --- > 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);