On Fri, Feb 01, 2008 at 04:12:01PM -0600, Anthony Liguori wrote:
> Index: qemu/hw/vga_int.h
> ===================================================================
> --- qemu.orig/hw/vga_int.h    2008-02-01 15:23:45.000000000 -0600
> +++ qemu/hw/vga_int.h 2008-02-01 15:29:04.000000000 -0600
> @@ -145,11 +145,20 @@
>      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 */
> +    uint32_t last_ch_attr[CH_ATTR_SIZE]; /* XXX: make it dynamic */  \
> +    unsigned long map_addr;                                          \
> +    unsigned long map_end;
>  
>  
>  typedef struct VGAState {
>      VGA_STATE_COMMON
> +
> +    int32_t  aliases_enabled;
> +    int32_t  pad1;
> +    uint32_t aliased_bank_base[2];
> +    uint32_t aliased_bank_limit[2];
> +
> +

These need to move into VGA_STATE_COMMON instead. Otherwise vmware_vga
will get confoozled becuase it relies on vga.c for its vesa
implementation. The patch is at:

        
http://people.ubuntu.com/~soren/0001-Move-common-VGAState-attributes-to-VGA_STATE_COMMON.patch

/me grumbles about sourceforge's mailing list archive thing completely
messing up the formatting of patches...

-- 
Soren Hansen
Virtualisation specialist
Ubuntu Server Team
http://www.ubuntu.com/

Attachment: signature.asc
Description: Digital signature

Reply via email to