From 39e934cbbdb360801c555a44d5871601f3f99604 Mon Sep 17 00:00:00 2001 From: bfu Date: Mon, 24 Mar 2025 17:07:51 +0800 Subject: [PATCH] Remove device number hardcode for secure execution on s390x Secure exectuion: remove hardcode of device number for secure execution related cases on s390x, cause we are adding device number by default, reference to https://github.com/avocado-framework/avocado-vt/pull/4010 Signed-off-by: bfu --- qemu/tests/cfg/secure_execution.cfg | 2 -- qemu/tests/cfg/secure_img.cfg | 2 -- 2 files changed, 4 deletions(-) diff --git a/qemu/tests/cfg/secure_execution.cfg b/qemu/tests/cfg/secure_execution.cfg index 1d1a6e8c09..2116875cd4 100644 --- a/qemu/tests/cfg/secure_execution.cfg +++ b/qemu/tests/cfg/secure_execution.cfg @@ -8,8 +8,6 @@ kill_vm = yes machine_type_extra_params = "usb=off,dump-guest-core=off,confidential-guest-support=lsec0" extra_params = "-object s390-pv-guest,id=lsec0" - nic_extra_params = "devno=fe.0.0001" - virtio_serial_extra_params = "devno=fe.0.0002" variants: - 247_max_vCPUs: smp = 247 diff --git a/qemu/tests/cfg/secure_img.cfg b/qemu/tests/cfg/secure_img.cfg index e49067875f..8c5dbe7a19 100644 --- a/qemu/tests/cfg/secure_img.cfg +++ b/qemu/tests/cfg/secure_img.cfg @@ -7,8 +7,6 @@ kill_vm = yes machine_type_extra_params = "usb=off,dump-guest-core=off,confidential-guest-support=lsec0" extra_params = "-object s390-pv-guest,id=lsec0" - nic_extra_params = "devno=fe.0.0001" - virtio_serial_extra_params = "devno=fe.0.0002" secure_params_cmd = 'echo "$(cat /proc/cmdline) swiotlb=262144" > /home/parmfile' # For HKD.crt in boot_img, it's a private cerfitication for specific s390x machines boot_img_cmd = 'genprotimg -k /home/HKD.crt -p /home/parmfile -i %s -r %s -o /boot/secure-linux --no-verify'