Skip to content

various_mem_ballongs: fix device detection on s390x #6669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 1, 2025
+5 −3
Merged

various_mem_ballongs: fix device detection on s390x #6669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libvirt/tests/cfg/memory/memory_balloon/various_mem_balloons.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
memballoon_device_str = "balloon"
sized_event_type = "yes"
mem_attrs = {'memory_unit':'KiB','memory':${mem_value},'current_mem':${current_mem},'current_mem_unit':'KiB'}
s390-virtio:
guest_cmd = 'lscss'
variants:
- virtio:
memballoon_model = "virtio"
Expand Down
6 changes: 3 additions & 3 deletions libvirt/tests/src/memory/memory_balloon/various_mem_balloons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def check_device_on_qemu_cmd_line():
expect_exist = (memballoon_model != "none")
libvirt.check_qemu_cmd_line(pattern, expect_exist=expect_exist)

def check_device_on_guest(guest_session=None, close_session=False):
def check_device_on_guest(guest_session=None, close_session=False, guest_cmd="lspci -vvv"):
"""
Check if memory balloon device exists on guest.

Expand All @@ -42,7 +42,6 @@ def check_device_on_guest(guest_session=None, close_session=False):
"""

test.log.info("TEST_STEP: 5. Check device exists on guest")
guest_cmd = "lspci -vvv"
if guest_session is None:
guest_session = vm.wait_for_login()

Expand Down Expand Up @@ -225,7 +224,7 @@ def run_test():
expected_xpath = [{'element_attrs': [f".//memballoon[@model='{memballoon_model}']/alias[@name='{memballoon_alias_name}']"]}]
check_vm_xml(expected_xpath)
check_device_on_qemu_cmd_line() # TEST_STEP: 4. Check the qemu cmd for device & id)
guest_session = check_device_on_guest() # TEST_STEP: 5. Check device exists on guest
guest_session = check_device_on_guest(guest_cmd=guest_cmd) # TEST_STEP: 5. Check device exists on guest

virsh_helper.check_save_restore(save_file_name) # TEST_STEP: 6. save and restore

Expand Down Expand Up @@ -269,6 +268,7 @@ def teardown_test():
memballoon_model = params.get("memballoon_model", "")
memballoon_alias_name = params.get("memballoon_alias_name", "")
model_defined = (memballoon_model != "none")
guest_cmd = params.get("guest_cmd", "lspci -vvv")

mem_unit = params.get("mem_unit", "")
mem_value = params.get("mem_value", "")
Expand Down