From 8b69f13025fb58cc60d1e97b7f0839431a94f844 Mon Sep 17 00:00:00 2001 From: Yingshun Cui Date: Fri, 10 Nov 2023 17:07:18 +0800 Subject: [PATCH] vDPA: Add a locked memory case about mixed interfaces Move a mem_lock check for both vdpa interface and vfio interface to virtual_network. Signed-off-by: Yingshun Cui --- .../mem_lock_limit_multiple_mixed_interfaces.cfg | 14 -------------- .../mem_lock_limit_multiple_mixed_interfaces.cfg | 13 +++++++++++++ .../mem_lock_limit_multiple_mixed_interfaces.py | 0 3 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 libvirt/tests/cfg/virtual_interface/locked_memory_check/mem_lock_limit_multiple_mixed_interfaces.cfg create mode 100644 libvirt/tests/cfg/virtual_network/locked_memory_vdpa/mem_lock_limit_multiple_mixed_interfaces.cfg rename libvirt/tests/src/{virtual_interface/locked_memory_check => virtual_network/locked_memory_vdpa}/mem_lock_limit_multiple_mixed_interfaces.py (100%) diff --git a/libvirt/tests/cfg/virtual_interface/locked_memory_check/mem_lock_limit_multiple_mixed_interfaces.cfg b/libvirt/tests/cfg/virtual_interface/locked_memory_check/mem_lock_limit_multiple_mixed_interfaces.cfg deleted file mode 100644 index 9df6ae8efe..0000000000 --- a/libvirt/tests/cfg/virtual_interface/locked_memory_check/mem_lock_limit_multiple_mixed_interfaces.cfg +++ /dev/null @@ -1,14 +0,0 @@ -- iface.locked_memory_check.mixed_interfaces: - type = mem_lock_limit_multiple_mixed_interfaces - start_vm = no - variants dev_type: - - vdpa: - only x86_64 - func_supported_since_libvirt_ver = (8, 10, 0) - vm_attrs = {'max_mem_rt': 6291456, 'max_mem_rt_slots': 32, 'max_mem_rt_unit': 'K', 'current_mem':2, 'current_mem_unit': 'GiB','vcpu': 8, 'cpu': {'numa_cell': [{'id': '0', 'cpus': '0-3', 'memory': '1', 'unit': 'GiB'}, {'id': '1', 'cpus': '4-7', 'memory': '1', 'unit': 'GiB'}]}} - iface_dict = {"source": {'dev':'/dev/vhost-vdpa-0'}} - iface_dict2 = {"source": {'dev':'/dev/vhost-vdpa-1'}} - variants test_scenario: - - cold_plug: - hostdev_dict = {'mode': 'subsystem', 'type': 'pci', 'managed': 'yes'} - - hot_plug: diff --git a/libvirt/tests/cfg/virtual_network/locked_memory_vdpa/mem_lock_limit_multiple_mixed_interfaces.cfg b/libvirt/tests/cfg/virtual_network/locked_memory_vdpa/mem_lock_limit_multiple_mixed_interfaces.cfg new file mode 100644 index 0000000000..15f9f4e0f2 --- /dev/null +++ b/libvirt/tests/cfg/virtual_network/locked_memory_vdpa/mem_lock_limit_multiple_mixed_interfaces.cfg @@ -0,0 +1,13 @@ +- virtual_network.locked_memory.vdpa_interface.mixed_interfaces: + type = mem_lock_limit_multiple_mixed_interfaces + start_vm = no + func_supported_since_libvirt_ver = (8, 10, 0) + vm_attrs = {'max_mem_rt': 6291456, 'max_mem_rt_slots': 32, 'max_mem_rt_unit': 'K', 'current_mem':2, 'current_mem_unit': 'GiB','vcpu': 8, 'cpu': {'numa_cell': [{'id': '0', 'cpus': '0-3', 'memory': '1', 'unit': 'GiB'}, {'id': '1', 'cpus': '4-7', 'memory': '1', 'unit': 'GiB'}]}} + iface_dict = {"source": {'dev':'/dev/vhost-vdpa-0'}} + iface_dict2 = {"source": {'dev':'/dev/vhost-vdpa-1'}} + only x86_64 + + variants test_scenario: + - cold_plug: + hostdev_dict = {'mode': 'subsystem', 'type': 'pci', 'managed': 'yes'} + - hot_plug: diff --git a/libvirt/tests/src/virtual_interface/locked_memory_check/mem_lock_limit_multiple_mixed_interfaces.py b/libvirt/tests/src/virtual_network/locked_memory_vdpa/mem_lock_limit_multiple_mixed_interfaces.py similarity index 100% rename from libvirt/tests/src/virtual_interface/locked_memory_check/mem_lock_limit_multiple_mixed_interfaces.py rename to libvirt/tests/src/virtual_network/locked_memory_vdpa/mem_lock_limit_multiple_mixed_interfaces.py