From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QpL7L-0002Md-BZ for qemu-devel@nongnu.org; Fri, 05 Aug 2011 10:11:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QpL7K-0006Z3-4U for qemu-devel@nongnu.org; Fri, 05 Aug 2011 10:11:15 -0400 Received: from mail-gx0-f173.google.com ([209.85.161.173]:50802) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QpL7J-0006Yw-V7 for qemu-devel@nongnu.org; Fri, 05 Aug 2011 10:11:14 -0400 Received: by gxk26 with SMTP id 26so144664gxk.4 for ; Fri, 05 Aug 2011 07:11:13 -0700 (PDT) Message-ID: <4E3BF9FE.3070505@codemonkey.ws> Date: Fri, 05 Aug 2011 09:11:10 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1312463195-13605-1-git-send-email-avi@redhat.com> <1312463195-13605-10-git-send-email-avi@redhat.com> In-Reply-To: <1312463195-13605-10-git-send-email-avi@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 09/39] cirrus: simplify linear framebuffer access functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, "Michael S. Tsirkin" On 08/04/2011 08:06 AM, Avi Kivity wrote: > Make use of the memory API's ability to satisfy multi-byte accesses via > multiple single-byte accesses. > > Reviewed-by: Richard Henderson > Signed-off-by: Avi Kivity Reviewed-by: Anthony Liguori Regards, Anthony Liguori > --- > hw/cirrus_vga.c | 74 ++++++------------------------------------------------- > 1 files changed, 8 insertions(+), 66 deletions(-) > > diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c > index 3db15bf..15ccf4a 100644 > --- a/hw/cirrus_vga.c > +++ b/hw/cirrus_vga.c > @@ -2249,7 +2249,8 @@ static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y) > * > ***************************************/ > > -static uint32_t cirrus_linear_readb(void *opaque, target_phys_addr_t addr) > +static uint64_t cirrus_linear_read(void *opaque, target_phys_addr_t addr, > + unsigned size) > { > CirrusVGAState *s = opaque; > uint32_t ret; > @@ -2277,28 +2278,8 @@ static uint32_t cirrus_linear_readb(void *opaque, target_phys_addr_t addr) > return ret; > } > > -static uint32_t cirrus_linear_readw(void *opaque, target_phys_addr_t addr) > -{ > - uint32_t v; > - > - v = cirrus_linear_readb(opaque, addr); > - v |= cirrus_linear_readb(opaque, addr + 1)<< 8; > - return v; > -} > - > -static uint32_t cirrus_linear_readl(void *opaque, target_phys_addr_t addr) > -{ > - uint32_t v; > - > - v = cirrus_linear_readb(opaque, addr); > - v |= cirrus_linear_readb(opaque, addr + 1)<< 8; > - v |= cirrus_linear_readb(opaque, addr + 2)<< 16; > - v |= cirrus_linear_readb(opaque, addr + 3)<< 24; > - return v; > -} > - > -static void cirrus_linear_writeb(void *opaque, target_phys_addr_t addr, > - uint32_t val) > +static void cirrus_linear_write(void *opaque, target_phys_addr_t addr, > + uint64_t val, unsigned size) > { > CirrusVGAState *s = opaque; > unsigned mode; > @@ -2338,49 +2319,6 @@ static void cirrus_linear_writeb(void *opaque, target_phys_addr_t addr, > } > } > > -static void cirrus_linear_writew(void *opaque, target_phys_addr_t addr, > - uint32_t val) > -{ > - cirrus_linear_writeb(opaque, addr, val& 0xff); > - cirrus_linear_writeb(opaque, addr + 1, (val>> 8)& 0xff); > -} > - > -static void cirrus_linear_writel(void *opaque, target_phys_addr_t addr, > - uint32_t val) > -{ > - cirrus_linear_writeb(opaque, addr, val& 0xff); > - cirrus_linear_writeb(opaque, addr + 1, (val>> 8)& 0xff); > - cirrus_linear_writeb(opaque, addr + 2, (val>> 16)& 0xff); > - cirrus_linear_writeb(opaque, addr + 3, (val>> 24)& 0xff); > -} > - > - > -static uint64_t cirrus_linear_read(void *opaque, target_phys_addr_t addr, > - unsigned size) > -{ > - CirrusVGAState *s = opaque; > - > - switch (size) { > - case 1: return cirrus_linear_readb(s, addr); > - case 2: return cirrus_linear_readw(s, addr); > - case 4: return cirrus_linear_readl(s, addr); > - default: abort(); > - } > -} > - > -static void cirrus_linear_write(void *opaque, target_phys_addr_t addr, > - uint64_t data, unsigned size) > -{ > - CirrusVGAState *s = opaque; > - > - switch (size) { > - case 1: return cirrus_linear_writeb(s, addr, data); > - case 2: return cirrus_linear_writew(s, addr, data); > - case 4: return cirrus_linear_writel(s, addr, data); > - default: abort(); > - } > -} > - > /*************************************** > * > * system to screen memory access > @@ -2860,6 +2798,10 @@ static const MemoryRegionOps cirrus_linear_io_ops = { > .read = cirrus_linear_read, > .write = cirrus_linear_write, > .endianness = DEVICE_LITTLE_ENDIAN, > + .impl = { > + .min_access_size = 1, > + .max_access_size = 1, > + }, > }; > > static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci)