[Libguestfs] [virt-v2v wave 2 PATCH v2 09/16] lib/types: remove "QXL" constructor for "guestcaps_video_type"

[Laszlo Ersek]

Removing the "QXL" constructor only needs the obvious fixup in the various
pattern matches.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1961107
Signed-off-by: Laszlo Ersek <lersek at redhat.com>
---

Notes:
    v1:
    
    - Drop the "convert/convert_linux.ml" and "convert/windows_virtio.ml"
      hunks; those files contain no QXL references at this point.
    
    - contextual conflict, due to commit f0afc4395248 ("Remove
      guestcaps_block_type Virtio_SCSI", 2021-11-08), auto-resolved in
      "lib/types.mli" and "lib/types.ml"
    
    - resolve conflict in "output/openstack_image_properties.ml", due to new
      patch "output: handle Standard_VGA in the OpenStack format"
    
    - resolve conflict in "output/create_json.ml", due to new patch "output:
      handle Standard_VGA in the JSON format"

 lib/types.mli                        | 2 +-
 lib/types.ml                         | 3 +--
 output/create_json.ml                | 1 -
 output/create_libvirt_xml.ml         | 1 -
 output/openstack_image_properties.ml | 1 -
 output/output.ml                     | 1 -
 6 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/types.mli b/lib/types.mli
index 3a2ba9fecf9a..a3eef963acb2 100644
--- a/lib/types.mli
+++ b/lib/types.mli
@@ -284,7 +284,7 @@ type guestcaps = {
 
 and guestcaps_block_type = Virtio_blk | IDE
 and guestcaps_net_type = Virtio_net | E1000 | RTL8139
-and guestcaps_video_type = Standard_VGA | QXL | Cirrus
+and guestcaps_video_type = Standard_VGA | Cirrus
 and guestcaps_machine = I440FX | Q35 | Virt
 
 val string_of_guestcaps : guestcaps -> string
diff --git a/lib/types.ml b/lib/types.ml
index e7fc8b38787c..864ab8b689ed 100644
--- a/lib/types.ml
+++ b/lib/types.ml
@@ -424,7 +424,7 @@ type guestcaps = {
 }
 and guestcaps_block_type = Virtio_blk | IDE
 and guestcaps_net_type = Virtio_net | E1000 | RTL8139
-and guestcaps_video_type = Standard_VGA | QXL | Cirrus
+and guestcaps_video_type = Standard_VGA | Cirrus
 and guestcaps_machine = I440FX | Q35 | Virt
 
 let string_of_block_type = function
@@ -436,7 +436,6 @@ let string_of_net_type = function
   | RTL8139 -> "rtl8139"
 let string_of_video = function
   | Standard_VGA -> "stdvga"
-  | QXL -> "qxl"
   | Cirrus -> "cirrus"
 let string_of_machine = function
   | I440FX -> "i440fx"
diff --git a/output/create_json.ml b/output/create_json.ml
index ac044630a0c6..add4d886a636 100644
--- a/output/create_json.ml
+++ b/output/create_json.ml
@@ -204,7 +204,6 @@ let create_json_metadata source inspect
     let video =
       match guestcaps.gcaps_video with
       | Standard_VGA -> "vga"
-      | QXL -> "qxl"
       | Cirrus -> "cirrus" in
     let machine =
       match guestcaps.gcaps_machine with
diff --git a/output/create_libvirt_xml.ml b/output/create_libvirt_xml.ml
index 623755de7212..9cf872861110 100644
--- a/output/create_libvirt_xml.ml
+++ b/output/create_libvirt_xml.ml
@@ -422,7 +422,6 @@ let create_libvirt_xml ?pool source inspect
     let video_model =
       match guestcaps.gcaps_video with
       | 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;
     e "video" [] [ video_model ] in
diff --git a/output/openstack_image_properties.ml b/output/openstack_image_properties.ml
index 9d466ecfbf0f..2d62efa1a3dc 100644
--- a/output/openstack_image_properties.ml
+++ b/output/openstack_image_properties.ml
@@ -44,7 +44,6 @@ let create source inspect { target_buses; guestcaps; target_firmware } =
     "hw_video_model",
     (match guestcaps.gcaps_video with
      | Standard_VGA -> "vga"
-     | QXL -> "qxl"
      | Cirrus -> "cirrus");
     "hw_machine_type",
     (match guestcaps.gcaps_machine with
diff --git a/output/output.ml b/output/output.ml
index 7df90db33fa1..013d5424549d 100644
--- a/output/output.ml
+++ b/output/output.ml
@@ -1542,7 +1542,6 @@ and qemu_finalize dir source inspect target_meta
         (match guestcaps.gcaps_video with
          | Standard_VGA -> "std"
          | Cirrus -> "cirrus"
-         | QXL -> "qxl"
         )
   );
 
-- 
2.19.1.3.g30247aa5d201