diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-18 07:34:24 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-18 07:34:24 -0500 |
| commit | e531761d63b7f8fe6b6423fafb3616ebbff768aa (patch) | |
| tree | a4ca2537f1e887d8c81ff6820baccb039634d320 /hw/vga_int.h | |
| parent | b1999e87b4d42305419329cae459e1b43f706d96 (diff) | |
| parent | 1562e53112fd1082c656a06d953a7447ab17e6e1 (diff) | |
| download | qemu-e531761d63b7f8fe6b6423fafb3616ebbff768aa.tar.gz | |
Merge remote-tracking branch 'kraxel/pixman.v8' into staging
# By Gerd Hoffmann (18) and others
# Via Blue Swirl (1) and Gerd Hoffmann (1)
* kraxel/pixman.v8: (37 commits)
console: remove ds_get_* helper functions
console: zap color_table
console: stop using DisplayState in gfx hardware emulation
console: zap displaystate from dcl callbacks
cocoa: stop using DisplayState
spice: stop using DisplayState
sdl: stop using DisplayState
vnc: stop using DisplayState
gtk: stop using DisplayState
console: add surface_*() getters
console: rework DisplaySurface handling [dcl/ui side]
console: rework DisplaySurface handling [vga emu side]
sdl: drop dead code
qxl: better vga init in enter_vga_mode
qxl: zap qxl0 global
spice: zap sdpy global
console: kill DisplayState->opaque
console: fix displaychangelisteners interface
s390: Fix cpu refactoring fallout.
target-mips: fix rndrashift_short_acc and code for EXTR_ instructions
...
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 8d496ea9bf..260f7d6948 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -132,7 +132,7 @@ typedef struct VGACommonState { uint32_t vbe_bank_mask; int vbe_mapped; /* display refresh support */ - DisplayState *ds; + QemuConsole *con; uint32_t font_offsets[2]; int graphic_mode; uint8_t shift_control; |