diff options
| author | Aurelien Jarno | 2010-12-27 22:59:48 +0100 |
|---|---|---|
| committer | Aurelien Jarno | 2010-12-27 22:59:48 +0100 |
| commit | 818c2e1b9777599d333855330d94050b3432c8b7 (patch) | |
| tree | df85b289b7c0f797fbf5bf8ca5bca4422b387aa7 /hw/vga_int.h | |
| parent | x86: Filter out garbage from segment flags dump (diff) | |
| parent | vnc/spice: add set_passwd monitor command. (diff) | |
| download | qemu-818c2e1b9777599d333855330d94050b3432c8b7.tar.gz qemu-818c2e1b9777599d333855330d94050b3432c8b7.tar.xz qemu-818c2e1b9777599d333855330d94050b3432c8b7.zip | |
Merge branch 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemu
* 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemu:
vnc/spice: add set_passwd monitor command.
vnc: support password expire
vnc: auth reject cleanup
spice: add qmp 'query-spice' and hmp 'info spice' commands.
spice: connection events.
spice: add qxl device
spice: add qxl vgabios binary.
Diffstat (limited to 'hw/vga_int.h')
| -rw-r--r-- | hw/vga_int.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/vga_int.h b/hw/vga_int.h index bc1327fbf6..1067f2cc5f 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -106,7 +106,7 @@ typedef void (* vga_update_retrace_info_fn)(struct VGACommonState *s); typedef struct VGACommonState { uint8_t *vram_ptr; ram_addr_t vram_offset; - unsigned int vram_size; + uint32_t vram_size; uint32_t lfb_addr; uint32_t lfb_end; uint32_t map_addr; |