Merge pull request #4209 from mcasquer/3007_booting_hotplugging_disk_non_default_options

block_disk_not_default_options: creates new test case

Author: XueqiangWei

qemu/tests/block_disk_not_default_options.py

@@ -0,0 +1,104 @@
+from virttest import error_context, qemu_qtree
+
+from provider import disk_utils
+from provider.block_devices_plug import BlockDevicesPlug
+
+
+@error_context.context_aware
+def run(test, params, env):
+    """
+    Test the disk non-default options.
+
+    Steps:
+        1. Boot a VM with packed=true and page-per-vq=true
+        2. Verify the packed and page-per-vq values
+        3. Do some basic I/O operation in the VM
+        4. Unplug and hotplug the disk
+        5. Do again a basic I/O operation
+
+    :param test: QEMU test object.
+    :param params: Dictionary with the test parameters.
+    :param env: Dictionary with test environment.
+    """
+
+    def verify_non_default_options(option_key, expected_value):
+        """Verify the non-default values.
+        :param option_key: the QEMU option to be checked.
+        :param expected_value: the QEMU option expected value.
+        """
+        error_context.context(f"Verify {option_key} from monitor.", test.log.info)
+        qtree = qemu_qtree.QtreeContainer()
+        qtree_option_value = False
+        try:
+            qtree.parse_info_qtree(vm.monitor.info("qtree"))
+        except AttributeError:
+            test.cancel("Monitor doesn't support qtree skip this test")
+        error_msg = (
+            f"'{option_key}' value mismatch: expected %s but report from monitor is: %s"
+        )
+
+        for node in qtree.get_nodes():
+            if (
+                isinstance(node, qemu_qtree.QtreeDev)
+                and node.qtree.get(option_key) == expected_value
+            ):
+                qtree_option_value = node.qtree.get(option_key)
+                error_context.context(
+                    f"The qtree_option_value: {qtree_option_value}", test.log.debug
+                )
+
+        if qtree_option_value != expected_value:
+            error_msg = error_msg % (str(expected_value), qtree_option_value)
+            test.fail(error_msg)
+
+    vm = env.get_vm(params["main_vm"])
+    vm.verify_alive()
+
+    qtree_check_images = params.get_list("qtree_check_images", "stg0")
+
+    serial = params.object_params(qtree_check_images[0])["image_serial"]
+
+    fstype = params.get("fstype", None)
+    io_cmd = params.get("io_cmd", "")
+    clean_env = params.get_boolean("clean_env", True)
+
+    # To be configured by the user in the cfg
+    dst_dir = params.get("dst_dir", None)
+    disk_utils.execute_io_test(
+        params,
+        vm,
+        qtree_check_images[0],
+        serial,
+        fstype,
+        dst_dir=dst_dir,
+        io_command=io_cmd,
+        clean=clean_env,
+        ignore_all_errors=False,
+    )
+
+    for image in qtree_check_images:
+        qtree_check_image = params.get_dict(f"qtree_check_{image}", "{}")
+        if qtree_check_image:
+            for option_key in qtree_check_image:
+                error_context.base_context(
+                    f"Options to verify: {option_key} {qtree_check_image[option_key]}",
+                    test.log.debug,
+                )
+                verify_non_default_options(option_key, qtree_check_image[option_key])
+        else:
+            test.log.warning("There are no options to be checked in the qtree")
+
+    plug = BlockDevicesPlug(vm)
+    plug.unplug_devs_serial(qtree_check_images[0])
+    plug.hotplug_devs_serial(qtree_check_images[0])
+    disk_utils.execute_io_test(
+        params,
+        vm,
+        qtree_check_images[0],
+        serial,
+        fstype,
+        dst_dir=dst_dir,
+        io_command=io_cmd,
+        clean=clean_env,
+        ignore_all_errors=False,
+    )

qemu/tests/cfg/block_disk_not_default_options.cfg

@@ -0,0 +1,27 @@
+- block_disk_not_default_options:
+    type = block_disk_not_default_options
+    only x86_64
+    start_vm = yes
+    images += " stg0"
+    boot_drive_stg0 = yes
+    image_name_stg0 = images/stg0
+    image_size_stg0 = 8G
+    remove_image_stg0 = yes
+    force_create_image_stg0 = yes
+    image_serial_stg0 = "stg0"
+    blk_extra_params_stg0 = "serial=${image_serial_stg0}"
+    fstype = "xfs"
+    io_cmd = "dd if=/dev/zero of=%s/test.img bs=1M count=10 oflag=direct"
+    clean_env = yes
+    Windows:
+        fstype = "ntfs"
+        io_cmd = "dd if=/dev/urandom of=%s\test.dat bs=1M count=10"
+    variants:
+        - with_packed_and_ppv:
+            qtree_check_images = "stg0"
+            qtree_check_stg0 = packed=true page-per-vq=true
+            virtio_blk:
+                blk_extra_params_stg0 += ",packed=true,page-per-vq=true"
+            virtio_scsi:
+                bus_extra_params_stg0 = "packed=true,page-per-vq=true"
+                drive_bus_stg0 = 1