diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-07-03 21:09:27 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-07-03 21:09:27 +0100 |
| commit | 79c2b203a932db5882a3f328db53e5a448cd47f9 (patch) | |
| tree | fe9693b2ff4a245f79bdf4dc92ae3ff341dae2d1 /hw/block/Makefile.objs | |
| parent | 5be2a500896f53b36bf3757ff8abd37688e5954b (diff) | |
| parent | 1fcfdc435a3e25ab9037f6f7b8ab4bdf89ba1269 (diff) | |
| download | qemu-79c2b203a932db5882a3f328db53e5a448cd47f9.zip qemu-79c2b203a932db5882a3f328db53e5a448cd47f9.tar.gz qemu-79c2b203a932db5882a3f328db53e5a448cd47f9.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180703-pull-request' into staging
vga: disable global_vmstate, virtio-gpu scanout tracking fixes.
# gpg: Signature made Tue 03 Jul 2018 10:44:56 BST
# 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-20180703-pull-request:
vga: disable global_vmstate for 3.0+ machine types
virtio-gpu: disable scanout when backing resource is destroyed
virtio-gpu: update old resource too.
virtio-gpu: tweak scanout disable.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
# hw/display/qxl.c
# hw/display/vga-isa-mm.c
Diffstat (limited to 'hw/block/Makefile.objs')
0 files changed, 0 insertions, 0 deletions