diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-01 11:14:39 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-01 11:14:39 -0500 |
| commit | 4ba79505f43bd0ace35c3fe42197eb02e7e0478e (patch) | |
| tree | eb1ecd216c1134a88ac0e2d3bc7185319c82fb95 /hw/nseries.c | |
| parent | d971919f08ca300e7b3595a4c5ddaea2ce8fc3ba (diff) | |
| parent | 64f735920ad319aee860e56bb9bad6cfccf4ad40 (diff) | |
Merge remote-tracking branch 'kraxel/pixman.v3' into staging
* kraxel/pixman.v3: (22 commits)
pixman: drop obsolete fields from DisplaySurface
pixman/vnc: remove dead code.
pixman/vnc: remove rgb_prepare_row* functions
pixman/vnc: use pixman images in vnc.
pixman: switch screendump function.
vga: stop direct access to DisplaySurface fields.
qxl: stop direct access to DisplaySurface fields.
console: don't set PixelFormat alpha fields for 32bpp
console: make qemu_alloc_display static
pixman: add pixman image to DisplaySurface
pixman: helper functions
pixman: windup in configure & makefiles
pixman: add submodule
console: remove DisplayAllocator
console: remove dpy_gfx_fill
vga: fix text mode updating
console: init displaychangelisteners on register
console: untangle gfx & txt updates
console: s/TextConsole/QemuConsole/
console: move set_mouse + cursor_define callbacks
...
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/nseries.c')
| -rw-r--r-- | hw/nseries.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/nseries.c b/hw/nseries.c index 652d9da333..2de8d21f08 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -1375,7 +1375,7 @@ static void n8x0_init(QEMUMachineInitArgs *args, size until the guest activates the display. */ ds = get_displaystate(); ds->surface = qemu_resize_displaysurface(ds, 800, 480); - dpy_resize(ds); + dpy_gfx_resize(ds); } static struct arm_boot_info n800_binfo = { |