From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuSI-0004xB-KN for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTuSH-0006PS-Eh for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:06 -0400 Received: from mail-ia0-f173.google.com ([209.85.210.173]:60542) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTuSH-000627-Aw for qemu-devel@nongnu.org; Thu, 01 Nov 2012 09:05:05 -0400 Received: by mail-ia0-f173.google.com with SMTP id m10so1965034iam.4 for ; Thu, 01 Nov 2012 06:05:05 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Thu, 1 Nov 2012 08:04:13 -0500 Message-Id: <1351775071-7644-12-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1351775071-7644-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1351775071-7644-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 11/29] cirrus: qidl_declare PCICirrusVGAState + CirrusVGAState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, blauwirbel@gmail.com, pbonzini@redhat.com Signed-off-by: Michael Roth --- hw/cirrus_vga.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index e4af2e9..f9c8b46 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -31,6 +31,7 @@ #include "console.h" #include "vga_int.h" #include "loader.h" +#include "qidl.h" /* * TODO: @@ -196,7 +197,9 @@ typedef void (*cirrus_bitblt_rop_t) (struct CirrusVGAState *s, typedef void (*cirrus_fill_t)(struct CirrusVGAState *s, uint8_t *dst, int dst_pitch, int width, int height); -typedef struct CirrusVGAState { +typedef struct CirrusVGAState CirrusVGAState; + +QIDL_DECLARE(CirrusVGAState) { VGACommonState vga; MemoryRegion cirrus_linear_io; @@ -229,11 +232,11 @@ typedef struct CirrusVGAState { uint32_t cirrus_blt_srcaddr; uint8_t cirrus_blt_mode; uint8_t cirrus_blt_modeext; - cirrus_bitblt_rop_t cirrus_rop; + cirrus_bitblt_rop_t q_immutable cirrus_rop; #define CIRRUS_BLTBUFSIZE (2048 * 4) /* one line width */ uint8_t cirrus_bltbuf[CIRRUS_BLTBUFSIZE]; - uint8_t *cirrus_srcptr; - uint8_t *cirrus_srcptr_end; + uint8_t q_derived *cirrus_srcptr; + uint8_t q_derived *cirrus_srcptr_end; uint32_t cirrus_srccounter; /* hwcursor display state */ int last_hw_cursor_size; @@ -244,12 +247,14 @@ typedef struct CirrusVGAState { int real_vram_size; /* XXX: suppress that */ int device_id; int bustype; -} CirrusVGAState; +}; -typedef struct PCICirrusVGAState { +typedef struct PCICirrusVGAState PCICirrusVGAState; + +QIDL_DECLARE(PCICirrusVGAState) { PCIDevice dev; CirrusVGAState cirrus_vga; -} PCICirrusVGAState; +}; typedef struct ISACirrusVGAState { ISADevice dev; -- 1.7.9.5