From: David Woodhouse <dwmw@amazon.co.uk>
Date: Thu, 9 Mar 2023 17:34:44 +0000 (+0000)
Subject: Boot KVM/Xen guest with tuxrun
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fxenfv-test;p=users%2Fdwmw2%2Fqemu.git

Boot KVM/Xen guest with tuxrun

The drive tag doesn't work right, and drops extra args. And we're
using a temporary kernel build.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---

diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py
index d343376faa..8e372b75fa 100644
--- a/tests/avocado/tuxrun_baselines.py
+++ b/tests/avocado/tuxrun_baselines.py
@@ -83,7 +83,8 @@ class TuxRunBaselineTest(QemuSystemTest):
         use the per-test tags to fetch details.
         """
         base_url = f"https://storage.tuxboot.com/{self.tuxboot}/"
-        kernel_image =  self.fetch_asset(base_url + self.image)
+        #kernel_image =  self.fetch_asset(base_url + self.image)
+        kernel_image = self.fetch_asset('https://storage.tuxsuite.com/public/linaro/alex/builds/2MmnfXeo73oWy3oaJx1bxliw8z4/bzImage')
         disk_image_zst = self.fetch_asset(base_url + "rootfs.ext4.zst")
 
         cmd = f"{self.zstd} -d {disk_image_zst} -o {self.workdir}/rootfs.ext4"
@@ -408,3 +409,17 @@ class TuxRunBaselineTest(QemuSystemTest):
         :avocado: tags=shutdown:nowait
         """
         self.common_tuxrun(drive="driver=ide-hd,bus=ide.0,unit=0")
+
+    def test_x86_64_kvm_xen(self):
+        """
+        :avocado: tags=arch:x86_64
+        :avocado: tags=machine:q35
+        :avocado: tags=cpu:Nehalem
+        :avocado: tags=tuxboot:x86_64
+        :avocado: tags=image:bzImage
+        :avocado: tags=root:xvda
+        :avocado: tags=shutdown:nowait
+        """
+        self.require_accelerator("kvm")
+        self.vm.add_args("-accel", "kvm,xen-version=0x4000a,kernel-irqchip=split")
+        self.common_tuxrun(drive="driver=xen-disk,vdev=xvda")