aboutsummaryrefslogtreecommitdiff
path: root/softmmu
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-07-23 12:16:12 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-07-23 12:16:12 +0100
commita146af86c8247f41b641783428b95ee71eb0e43f (patch)
treed3fe21001857bb7cb22105fa0edf8df9947c5498 /softmmu
parent7b7ca8ebde4ee6fba171004b2726ae1ff5489c03 (diff)
parent8a13b9bc0f283caff4333c75bc396a963f47ce5c (diff)
downloadqemu-a146af86c8247f41b641783428b95ee71eb0e43f.zip
qemu-a146af86c8247f41b641783428b95ee71eb0e43f.tar.gz
qemu-a146af86c8247f41b641783428b95ee71eb0e43f.tar.bz2
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20210723-pull-request' into staging
vga: fixes for qxl and virtio-gpu # gpg: Signature made Fri 23 Jul 2021 06:54:34 BST # gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/vga-20210723-pull-request: hw/display: fix virgl reset regression vl: add virtio-vga-gl to the default_list hw/display: fail early when multiple virgl devices are requested Revert "qxl: add migration blocker to avoid pre-save assert" qxl: remove assert in qxl_pre_save. hw/display/virtio-gpu: Fix memory leak (CID 1453811) Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'softmmu')
-rw-r--r--softmmu/vl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c
index f4d8630..f815acc 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -202,6 +202,7 @@ static struct {
{ .driver = "virtio-vga", .flag = &default_vga },
{ .driver = "ati-vga", .flag = &default_vga },
{ .driver = "vhost-user-vga", .flag = &default_vga },
+ { .driver = "virtio-vga-gl", .flag = &default_vga },
};
static QemuOptsList qemu_rtc_opts = {