From 04c5edf5220cdf5fcc0e741a2fde9d2bf1850480 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 27 Oct 2021 13:13:18 +0200 Subject: [PATCH] output: handle Standard_VGA in the libvirt XML and QEMU cmdline formats Libvirt domain XML fragment (with the default video RAM size made explicit): Example QEMU cmdline option: -vga std References: - https://www.kraxel.org/blog/2019/09/display-devices-in-qemu/#VGA - https://libvirt.org/formatdomain.html#video-devices Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1961107 Signed-off-by: Laszlo Ersek --- output/create_libvirt_xml.ml | 2 +- output/output.ml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/output/create_libvirt_xml.ml b/output/create_libvirt_xml.ml index ec1cd455ef13..623755de7212 100644 --- a/output/create_libvirt_xml.ml +++ b/output/create_libvirt_xml.ml @@ -421,7 +421,7 @@ let create_libvirt_xml ?pool source inspect let video = let video_model = match guestcaps.gcaps_video with - | Standard_VGA -> assert false + | Standard_VGA -> e "model" [ "type", "vga"; "vram", "16384" ] [] | QXL -> e "model" [ "type", "qxl"; "ram", "65536" ] [] | Cirrus -> e "model" [ "type", "cirrus"; "vram", "9216" ] [] in append_attr ("heads", "1") video_model; diff --git a/output/output.ml b/output/output.ml index d223313022a6..239d3810a395 100644 --- a/output/output.ml +++ b/output/output.ml @@ -1544,7 +1544,7 @@ and qemu_finalize dir source inspect target_meta ); arg "-vga" (match guestcaps.gcaps_video with - | Standard_VGA -> assert false + | Standard_VGA -> "std" | Cirrus -> "cirrus" | QXL -> "qxl" ) -- 2.19.1.3.g30247aa5d201