virtual_device: add graphics test for video devices test (#6400)

Expanded test coverage for video devices with graphics-aware
scenarios, validating presence/absence of graphics and video
devices.

Signed-off-by: Lili Zhu <lizhu@redhat.com>

Author: iccaszhulili

libvirt/tests/cfg/virtual_device/video_devices.cfg

@@ -5,6 +5,17 @@
         - positive_test:
             status_error = "no"
             variants:
+                - graphics_test:
+                    graphics_test = "yes"
+                    only no_primary_video
+                    only no_secondary_video
+                    video_device = "no"
+                    qemu_line = "-device.*id.*video"
+                    variants:
+                        - with_graphics:
+                            with_graphics = "yes"
+                        - no_graphics:
+                            with_graphics = "no"
                 - resolution_test:
                     no qxl
                     resolution_test = "yes"
@@ -129,6 +140,8 @@
                             no s390-virtio, aarch64
                             primary_video_model = bochs
                             only no_secondary_video..model_test.default no_secondary_video..vram..bochs_default_size
+                - no_primary_video:
+                    only graphics_test
         - negative_test:
             status_error = "yes"
             variants:

libvirt/tests/src/virtual_device/video_devices.py

@@ -179,6 +179,7 @@ def check_mem_test_cmd_line(model_type, mem_type, mem_size):
         cmdline = open('/proc/%s/cmdline' % vm.get_pid()).read().replace("\x00", " ")
         logging.debug("the cmdline is: %s" % cmdline)
 
+        pattern = ""
         if mem_type == "ram" or mem_type == "vram":
             cmd_mem_size = str(int(mem_size)*1024)
             pattern = r"-device.*qxl-vga.*%s_size\W{1,2}%s" % (mem_type, cmd_mem_size)
@@ -226,6 +227,9 @@ def up_round_to_power_of_two(num):
     resolution_test = params.get("resolution_test", "no") == "yes"
     resolution_x = params.get("resolution_x")
     resolution_y = params.get("resolution_y")
+    graphics_test = params.get("graphics_test", "no") == "yes"
+    with_graphics = params.get("with_graphics", "yes") == "yes"
+    video_device = params.get("video_device", "yes") == "yes"
 
     vm_xml = VMXML.new_from_dumpxml(vm_name)
     vm_xml_backup = vm_xml.copy()
@@ -238,31 +242,37 @@ def up_round_to_power_of_two(num):
 
     try:
         vm_xml.remove_all_device_by_type('video')
-        kwargs = {}
-        model_type = primary_video_model
-        is_primary = None
-        if secondary_video_model:
-            is_primary = True
-        if heads_test and not default_primary_heads:
-            kwargs["model_heads"] = primary_heads
-        if mem_test and not default_mem_size:
-            kwargs["model_" + mem_type] = mem_size
-        if model_type == "virtio" and with_packed:
-            kwargs["driver"] = {"packed": driver_packed}
-        if resolution_test:
-            kwargs["resolution"] = {"x": resolution_x, "y": resolution_y}
-        add_video_device(model_type, vm_xml, is_primary, status_error, **kwargs)
-
-        if secondary_video_model:
+        if graphics_test and not with_graphics:
+            vm_xml.remove_all_device_by_type('graphics')
+
+        if video_device:
             kwargs = {}
-            model_type = secondary_video_model
-            is_primary = False
-            if heads_test and not default_secondary_heads:
-                kwargs["model_heads"] = secondary_heads
+            model_type = primary_video_model
+            is_primary = None
+            if secondary_video_model:
+                is_primary = True
+            if heads_test and not default_primary_heads:
+                kwargs["model_heads"] = primary_heads
+            if mem_test and not default_mem_size:
+                kwargs["model_" + mem_type] = mem_size
             if model_type == "virtio" and with_packed:
                 kwargs["driver"] = {"packed": driver_packed}
+            if resolution_test:
+                kwargs["resolution"] = {"x": resolution_x, "y": resolution_y}
             add_video_device(model_type, vm_xml, is_primary, status_error, **kwargs)
 
+            if secondary_video_model:
+                kwargs = {}
+                model_type = secondary_video_model
+                is_primary = False
+                if heads_test and not default_secondary_heads:
+                    kwargs["model_heads"] = secondary_heads
+                if model_type == "virtio" and with_packed:
+                    kwargs["driver"] = {"packed": driver_packed}
+                add_video_device(model_type, vm_xml, is_primary, status_error, **kwargs)
+
+        vm_xml.sync()
+
         if not status_error:
             res = virsh.start(vm_name)
 
@@ -271,6 +281,10 @@ def up_round_to_power_of_two(num):
                           "device xml. details: %s " % res)
             logging.debug("vm started successfully in positive cases.")
 
+            if graphics_test:
+                libvirt.check_qemu_cmd_line(params.get("qemu_line"),
+                                            expect_exist=with_graphics)
+
             if resolution_test:
                 libvirt.check_qemu_cmd_line(params.get("qemu_line"))