diff --git a/qemu/tests/cfg/hotplug_virtio_mem.cfg b/qemu/tests/cfg/hotplug_virtio_mem.cfg index c6a94de17a..14241eedff 100644 --- a/qemu/tests/cfg/hotplug_virtio_mem.cfg +++ b/qemu/tests/cfg/hotplug_virtio_mem.cfg @@ -29,3 +29,4 @@ pcie_extra_root_port = 1 requested-size_test_vmem0 = "4G 2G" error_msg = "virtio-mem device cannot get unplugged while 'size' != '0'" + new_error_msg = "virtio-mem device cannot get unplugged while some of its memory is still plugged" diff --git a/qemu/tests/hotplug_virtio_mem.py b/qemu/tests/hotplug_virtio_mem.py index 0a3bc88c0c..2b45265f99 100644 --- a/qemu/tests/hotplug_virtio_mem.py +++ b/qemu/tests/hotplug_virtio_mem.py @@ -34,6 +34,8 @@ def run(test, params, env): timeout = params.get_numeric("login_timeout", 240) threshold = params.get_numeric("threshold", target_type=float) error_msg = params.get("error_msg") + if qemu_version in VersionInterval("[9.0.0,)"): + error_msg = params.get("new_error_msg") qemu_path = utils_misc.get_qemu_binary(params) qemu_version = utils_qemu.get_qemu_version(qemu_path)[0] vm = env.get_vm(params["main_vm"]) @@ -67,7 +69,7 @@ def run(test, params, env): virtio_mem_utils.check_numa_plugged_mem( node_id, requested_size, threshold, vm, test ) - if qemu_version in VersionInterval('[8.1.0,)'): + if qemu_version in VersionInterval("[8.1.0,)"): try: hotplug_test.unplug_memory(vm, target_mem) except QMPCmdError as e: