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

[Laszlo Ersek]

At this point, virt-v2v only recognizes, but never creates, the "Cirrus"
value of "guestcaps_video_type". Remove "Cirrus", and simplify the
affected pattern matches.

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

Notes:
    v1:
    
    - new in v1

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

diff --git a/lib/types.mli b/lib/types.mli
index a3eef963acb2..8d48c300ec17 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 | Cirrus
+and guestcaps_video_type = Standard_VGA
 and guestcaps_machine = I440FX | Q35 | Virt
 
 val string_of_guestcaps : guestcaps -> string
diff --git a/lib/types.ml b/lib/types.ml
index 864ab8b689ed..37696ebbabdd 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 | Cirrus
+and guestcaps_video_type = Standard_VGA
 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"
-  | Cirrus -> "cirrus"
 let string_of_machine = function
   | I440FX -> "i440fx"
   | Q35 -> "q35"
diff --git a/output/create_json.ml b/output/create_json.ml
index add4d886a636..3f6a734c9f8e 100644
--- a/output/create_json.ml
+++ b/output/create_json.ml
@@ -203,8 +203,7 @@ let create_json_metadata source inspect
       | RTL8139 -> "rtl8139" in
     let video =
       match guestcaps.gcaps_video with
-      | Standard_VGA -> "vga"
-      | Cirrus -> "cirrus" in
+      | Standard_VGA -> "vga" in
     let machine =
       match guestcaps.gcaps_machine with
       | I440FX -> "i440fx"
diff --git a/output/create_libvirt_xml.ml b/output/create_libvirt_xml.ml
index 9cf872861110..041643969c23 100644
--- a/output/create_libvirt_xml.ml
+++ b/output/create_libvirt_xml.ml
@@ -421,8 +421,7 @@ let create_libvirt_xml ?pool source inspect
   let video =
     let video_model =
       match guestcaps.gcaps_video with
-      | Standard_VGA -> e "model" [ "type", "vga"; "vram", "16384" ] []
-      | Cirrus -> e "model" [ "type", "cirrus"; "vram", "9216" ] [] in
+      | Standard_VGA -> e "model" [ "type", "vga"; "vram", "16384" ] [] in
     append_attr ("heads", "1") video_model;
     e "video" [] [ video_model ] in
   List.push_back devices video;
diff --git a/output/openstack_image_properties.ml b/output/openstack_image_properties.ml
index 2d62efa1a3dc..0a7d366967b6 100644
--- a/output/openstack_image_properties.ml
+++ b/output/openstack_image_properties.ml
@@ -43,8 +43,7 @@ let create source inspect { target_buses; guestcaps; target_firmware } =
      | RTL8139 -> "rtl8139");
     "hw_video_model",
     (match guestcaps.gcaps_video with
-     | Standard_VGA -> "vga"
-     | Cirrus -> "cirrus");
+     | Standard_VGA -> "vga");
     "hw_machine_type",
     (match guestcaps.gcaps_machine with
      | I440FX -> "pc"
diff --git a/output/output.ml b/output/output.ml
index 013d5424549d..8bf3054999bc 100644
--- a/output/output.ml
+++ b/output/output.ml
@@ -1541,7 +1541,6 @@ and qemu_finalize dir source inspect target_meta
       arg "-vga"
         (match guestcaps.gcaps_video with
          | Standard_VGA -> "std"
-         | Cirrus -> "cirrus"
         )
   );
 
-- 
2.19.1.3.g30247aa5d201