Soren Hansen wrote:
> I was told to resend this, so here goes:
>
> vmware_vga.c uses functions in vga.c to do some things. They
> need to agree on which parts of their state struct is common
> and which aren't, otherwise they'll overwrite parts of each
> other's state. This patch makes it so.
>
> Signed-off-by: Soren Hansen <[EMAIL PROTECTED]>
> ---
> qemu/hw/cirrus_vga.c | 3 ---
> qemu/hw/vga_int.h | 17 +++++++----------
> 2 files changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/qemu/hw/cirrus_vga.c b/qemu/hw/cirrus_vga.c
> index 1915c73..35cee6b 100644
> --- a/qemu/hw/cirrus_vga.c
> +++ b/qemu/hw/cirrus_vga.c
> @@ -240,9 +240,6 @@ typedef struct CirrusVGAState {
> int cirrus_mmio_io_addr;
> unsigned long cirrus_lfb_addr;
> unsigned long cirrus_lfb_end;
> - int aliases_enabled;
> - uint32_t aliased_bank_base[2];
> - uint32_t aliased_bank_limit[2];
> uint32_t cirrus_addr_mask;
> uint32_t linear_mmio_mask;
> uint8_t cirrus_shadow_gr0;
> diff --git a/qemu/hw/vga_int.h b/qemu/hw/vga_int.h
> index 912d977..c620ce9 100644
> --- a/qemu/hw/vga_int.h
> +++ b/qemu/hw/vga_int.h
> @@ -145,20 +145,17 @@
> void (*cursor_draw_line)(struct VGAState *s, uint8_t *d, int y); \
> /* tell for each page if it has been updated since the last time */ \
> uint32_t last_palette[256]; \
> - uint32_t last_ch_attr[CH_ATTR_SIZE]; /* XXX: make it dynamic */ \
> - unsigned long map_addr; \
> - unsigned long map_end;
> + uint32_t last_ch_attr[CH_ATTR_SIZE]; /* XXX: make it dynamic */ \
> + unsigned long map_addr; \
> + unsigned long map_end; \
> + int32_t aliases_enabled; \
> + int32_t pad1; \
> + uint32_t aliased_bank_base[2]; \
> + uint32_t aliased_bank_limit[2];
>
The changes to last_ch_attr, map_addr, etc. are gratuitous and will
cause merge conflicts in the future. Please change only the relevant lines.
--
error compiling committee.c: too many arguments to function
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel
