diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-11 13:32:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-11 13:32:50 +0100 |
| commit | 5144fe36056d3a94b0d8da9e10adc555c057baa8 (patch) | |
| tree | 67d28d4c9b422b89d080ca5bbbf8c10393528675 /include | |
| parent | 9628af036fade986dcc94f4484bc75c6b1a06d84 (diff) | |
| parent | fa49e4656a641af84e4cdf40c8d12dacb25dc0aa (diff) | |
| download | qemu-5144fe36056d3a94b0d8da9e10adc555c057baa8.zip qemu-5144fe36056d3a94b0d8da9e10adc555c057baa8.tar.gz qemu-5144fe36056d3a94b0d8da9e10adc555c057baa8.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20160411-1' into staging
virtio-gpu: pixman surface fix, block live migration
# gpg: Signature made Mon 11 Apr 2016 11:45:18 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-vga-20160411-1:
virtio-gpu: block live migration
ui/virtio-gpu: add and use qemu_create_displaysurface_pixman
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/console.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index eb9419d..d5a88d9 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -234,6 +234,7 @@ DisplayState *init_displaystate(void); DisplaySurface *qemu_create_displaysurface_from(int width, int height, pixman_format_code_t format, int linesize, uint8_t *data); +DisplaySurface *qemu_create_displaysurface_pixman(pixman_image_t *image); DisplaySurface *qemu_create_displaysurface_guestmem(int width, int height, pixman_format_code_t format, int linesize, |