From: Thomas Huth <thuth@redhat.com>
Remove unused imports, write constants with capital letters and make
sure that the code uses the right indentation / formatting.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.../aarch64/test_device_passthrough.py | 26 ++++++++++++-------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/tests/functional/aarch64/test_device_passthrough.py b/tests/functional/aarch64/test_device_passthrough.py
index 05a3f52d5e2..10c73728f36 100755
--- a/tests/functional/aarch64/test_device_passthrough.py
+++ b/tests/functional/aarch64/test_device_passthrough.py
@@ -10,13 +10,13 @@
# SPDX-License-Identifier: GPL-2.0-or-later
from os.path import join
+from random import randbytes
from qemu_test import QemuSystemTest, Asset
-from qemu_test import exec_command, wait_for_console_pattern
-from qemu_test import exec_command_and_wait_for_pattern
-from random import randbytes
+from qemu_test import wait_for_console_pattern
+
-guest_script = '''
+GUEST_SCRIPT = '''
#!/usr/bin/env bash
set -euo pipefail
@@ -56,7 +56,7 @@
-device vfio-pci,host=$pci_iommufd,iommufd=iommufd0
'''
-nested_guest_script = '''
+NESTED_GUEST_SCRIPT = '''
#!/usr/bin/env bash
set -euo pipefail
@@ -75,6 +75,7 @@
echo device_passthrough_test_ok
'''
+
class Aarch64DevicePassthrough(QemuSystemTest):
# https://github.com/pbo-linaro/qemu-linux-stack/tree/device_passthrough
@@ -86,7 +87,7 @@ class Aarch64DevicePassthrough(QemuSystemTest):
ASSET_DEVICE_PASSTHROUGH_STACK = Asset(
('https://github.com/pbo-linaro/qemu-linux-stack/'
'releases/download/build/device_passthrough-a9612a2.tar.xz'),
- 'f7d2f70912e7231986e6e293e1a2c4786dd02bec113a7acb6bfc619e96155455')
+ 'f7d2f70912e7231986e6e293e1a2c4786dd02bec113a7acb6bfc619e96155455')
# This tests the device passthrough implementation, by booting a VM
# supporting it with two nvme disks attached, and launching a nested VM
@@ -108,10 +109,14 @@ def test_aarch64_device_passthrough(self):
guest_cmd = join(stack, 'guest.sh')
nested_guest_cmd = join(stack, 'nested_guest.sh')
# we generate two random disks
- with open(disk_vfio, "wb") as d: d.write(randbytes(512))
- with open(disk_iommufd, "wb") as d: d.write(randbytes(1024))
- with open(guest_cmd, 'w') as s: s.write(guest_script)
- with open(nested_guest_cmd, 'w') as s: s.write(nested_guest_script)
+ with open(disk_vfio, "wb") as d:
+ d.write(randbytes(512))
+ with open(disk_iommufd, "wb") as d:
+ d.write(randbytes(1024))
+ with open(guest_cmd, 'w', encoding='utf-8') as s:
+ s.write(GUEST_SCRIPT)
+ with open(nested_guest_cmd, 'w', encoding='utf-8') as s:
+ s.write(NESTED_GUEST_SCRIPT)
self.vm.add_args('-cpu', 'max')
self.vm.add_args('-m', '2G')
@@ -139,5 +144,6 @@ def test_aarch64_device_passthrough(self):
wait_for_console_pattern(self, 'device_passthrough_test_ok',
failure_message='Kernel panic')
+
if __name__ == '__main__':
QemuSystemTest.main()
--
2.51.0