@@ -61,7 +61,6 @@ class BootLinuxAarch64(LinuxTest):
"""
:avocado: tags=arch:aarch64
:avocado: tags=machine:virt
- :avocado: tags=machine:gic-version=2
"""
def add_common_args(self):
@@ -80,7 +79,7 @@ def test_virt_tcg_gicv2(self):
self.require_accelerator("tcg")
self.vm.add_args("-accel", "tcg")
self.vm.add_args("-cpu", "max,lpa2=off")
- self.vm.add_args("-machine", "virt,gic-version=2")
+ self.vm.add_args("-machine", "gic-version=2")
self.add_common_args()
self.launch_and_wait(set_up_ssh_connection=False)
@@ -93,7 +92,7 @@ def test_virt_tcg_gicv3(self):
self.require_accelerator("tcg")
self.vm.add_args("-accel", "tcg")
self.vm.add_args("-cpu", "max,lpa2=off")
- self.vm.add_args("-machine", "virt,gic-version=3")
+ self.vm.add_args("-machine", "gic-version=3")
self.add_common_args()
self.launch_and_wait(set_up_ssh_connection=False)
@@ -104,7 +103,7 @@ def test_virt_kvm(self):
"""
self.require_accelerator("kvm")
self.vm.add_args("-accel", "kvm")
- self.vm.add_args("-machine", "virt,gic-version=host")
+ self.vm.add_args("-machine", "gic-version=host")
self.add_common_args()
self.launch_and_wait(set_up_ssh_connection=False)
BootLinuxAarch64 is already setting machine:virt in the avocado tags, meaning that we don't need to add '-machine virt' via add_args(). It's also adding an extra '-machine gic-version=2' parameter via an avocado tag, which is not ideal because: - it prevents self.machine from QEMUSystemTest to be set since there are multiple 'machine' avocado tests being set; - the tests are using different 'gic-version' setting, meaning that we're still needing to add '-machine gic-version=N' via add_args() regardless. Removing the 'machine=gic-version=2' tag allows us to set 'self.machine' without adding extra work. Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com> --- tests/avocado/boot_linux.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)