diff options
author | Peter Maydell | 2018-10-29 13:59:15 +0100 |
---|---|---|
committer | Peter Maydell | 2018-10-29 13:59:15 +0100 |
commit | ef3a6af5e789ff078d1fef880f9dfb6adf18e8f1 (patch) | |
tree | f2b4c405cce6352a69ba968599fbb810f3f00aec /hw/display/vga_int.h | |
parent | Merge remote-tracking branch 'remotes/famz/tags/testing-pull-request' into st... (diff) | |
parent | vga_int: remove unused function protype (diff) | |
download | qemu-ef3a6af5e789ff078d1fef880f9dfb6adf18e8f1.tar.gz qemu-ef3a6af5e789ff078d1fef880f9dfb6adf18e8f1.tar.xz qemu-ef3a6af5e789ff078d1fef880f9dfb6adf18e8f1.zip |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20181029-pull-request' into staging
vga: two fixes.
# gpg: Signature made Mon 29 Oct 2018 12:46:20 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20181029-pull-request:
vga_int: remove unused function protype
qxl: store channel id in qxl->id
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/vga_int.h')
-rw-r--r-- | hw/display/vga_int.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index 6e4fa48a79..55c418eab5 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -166,7 +166,6 @@ MemoryRegion *vga_init_io(VGACommonState *s, Object *obj, const MemoryRegionPortio **vbe_ports); void vga_common_reset(VGACommonState *s); -void vga_sync_dirty_bitmap(VGACommonState *s); void vga_dirty_log_start(VGACommonState *s); void vga_dirty_log_stop(VGACommonState *s); |