From: Cleber Rosa <crosa@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Radoslaw Biernacki" <rad@semihalf.com>,
"Paul Durrant" <paul@xen.org>,
"Akihiko Odaki" <akihiko.odaki@daynix.com>,
"Leif Lindholm" <quic_llindhol@quicinc.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
kvm@vger.kernel.org, qemu-arm@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Beraldo Leal" <bleal@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Sriram Yagnaraman" <sriram.yagnaraman@est.tech>,
"Marcin Juszkiewicz" <marcin.juszkiewicz@linaro.org>,
"Cleber Rosa" <crosa@redhat.com>,
"David Woodhouse" <dwmw2@infradead.org>
Subject: [PATCH 06/10] tests/avocado/kvm_xen_guest.py: cope with asset RW requirements
Date: Fri, 8 Dec 2023 14:09:07 -0500 [thread overview]
Message-ID: <20231208190911.102879-7-crosa@redhat.com> (raw)
In-Reply-To: <20231208190911.102879-1-crosa@redhat.com>
Some of these tests actually require the root filesystem image,
obtained through Avocado's asset feature and kept in a common cache
location, to be writable.
This makes a distinction between the tests that actually have this
requirement and those who don't. The goal is to be as safe as
possible, avoiding causing cache misses (because the assets get
modified and thus need to be dowloaded again) while avoid copying the
root filesystem backing file whenever possible.
This also allow these tests to be run in parallel with newer Avocado
versions.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
tests/avocado/kvm_xen_guest.py | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/tests/avocado/kvm_xen_guest.py b/tests/avocado/kvm_xen_guest.py
index ec4052a1fe..d73fa888ef 100644
--- a/tests/avocado/kvm_xen_guest.py
+++ b/tests/avocado/kvm_xen_guest.py
@@ -10,6 +10,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
import os
+import shutil
from qemu.machine import machine
@@ -43,7 +44,7 @@ def get_asset(self, name, sha1):
return self.fetch_asset(name=f"qemu-kvm-xen-guest-{name}",
locations=(url), asset_hash=sha1)
- def common_vm_setup(self):
+ def common_vm_setup(self, readwrite=False):
# We also catch lack of KVM_XEN support if we fail to launch
self.require_accelerator("kvm")
@@ -56,11 +57,19 @@ def common_vm_setup(self):
"367962983d0d32109998a70b45dcee4672d0b045")
self.rootfs = self.get_asset("rootfs.ext4",
"f1478401ea4b3fa2ea196396be44315bab2bb5e4")
+ if readwrite:
+ dest = os.path.join(self.workdir, os.path.basename(self.rootfs))
+ shutil.copy(self.rootfs, dest)
+ self.rootfs = dest
- def run_and_check(self):
+ def run_and_check(self, readwrite=False):
+ if readwrite:
+ drive = f"file={self.rootfs},if=none,format=raw,id=drv0"
+ else:
+ drive = f"file={self.rootfs},if=none,readonly=on,format=raw,id=drv0"
self.vm.add_args('-kernel', self.kernel_path,
'-append', self.kernel_params,
- '-drive', f"file={self.rootfs},if=none,format=raw,id=drv0",
+ '-drive', drive,
'-device', 'xen-disk,drive=drv0,vdev=xvda',
'-device', 'virtio-net-pci,netdev=unet',
'-netdev', 'user,id=unet,hostfwd=:127.0.0.1:0-:22')
@@ -90,11 +99,11 @@ def test_kvm_xen_guest(self):
:avocado: tags=kvm_xen_guest
"""
- self.common_vm_setup()
+ self.common_vm_setup(True)
self.kernel_params = (self.KERNEL_DEFAULT +
' xen_emul_unplug=ide-disks')
- self.run_and_check()
+ self.run_and_check(True)
self.ssh_command('grep xen-pirq.*msi /proc/interrupts')
def test_kvm_xen_guest_nomsi(self):
@@ -102,11 +111,11 @@ def test_kvm_xen_guest_nomsi(self):
:avocado: tags=kvm_xen_guest_nomsi
"""
- self.common_vm_setup()
+ self.common_vm_setup(True)
self.kernel_params = (self.KERNEL_DEFAULT +
' xen_emul_unplug=ide-disks pci=nomsi')
- self.run_and_check()
+ self.run_and_check(True)
self.ssh_command('grep xen-pirq.* /proc/interrupts')
def test_kvm_xen_guest_noapic_nomsi(self):
@@ -114,11 +123,11 @@ def test_kvm_xen_guest_noapic_nomsi(self):
:avocado: tags=kvm_xen_guest_noapic_nomsi
"""
- self.common_vm_setup()
+ self.common_vm_setup(True)
self.kernel_params = (self.KERNEL_DEFAULT +
' xen_emul_unplug=ide-disks noapic pci=nomsi')
- self.run_and_check()
+ self.run_and_check(True)
self.ssh_command('grep xen-pirq /proc/interrupts')
def test_kvm_xen_guest_vapic(self):
--
2.43.0
next prev parent reply other threads:[~2023-12-08 19:13 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-08 19:09 [PATCH 00/10] for-8.3 tests/avocado: prep for Avocado 103.0 LTS Cleber Rosa
2023-12-08 19:09 ` [PATCH 01/10] tests/avocado: mips: fallback to HTTP given certificate expiration Cleber Rosa
2023-12-11 16:51 ` Alex Bennée
2023-12-08 19:09 ` [PATCH 02/10] tests/avocado: mips: add hint for fetchasset plugin Cleber Rosa
2023-12-10 4:11 ` Akihiko Odaki
2023-12-13 19:39 ` Cleber Rosa
2023-12-08 19:09 ` [PATCH 03/10] tests/avocado/intel_iommu.py: increase timeout Cleber Rosa
2023-12-11 17:01 ` Alex Bennée
2023-12-12 8:18 ` Akihiko Odaki
2023-12-12 11:27 ` Alex Bennée
2023-12-13 20:08 ` Cleber Rosa
2023-12-14 7:24 ` Eric Auger
2023-12-14 9:41 ` Alex Bennée
2023-12-14 13:26 ` Eric Auger
2023-12-14 9:41 ` Philippe Mathieu-Daudé
2023-12-08 19:09 ` [PATCH 04/10] tests/avocado: machine aarch64: standardize location and RO/RW access Cleber Rosa
2023-12-08 20:03 ` Marcin Juszkiewicz
2023-12-13 21:01 ` Cleber Rosa
2023-12-14 10:30 ` Alex Bennée
2023-12-11 17:47 ` Alex Bennée
2023-12-13 21:14 ` Cleber Rosa
2023-12-14 10:34 ` Alex Bennée
2023-12-08 19:09 ` [PATCH 05/10] tests/avocado: use more distinct names for assets Cleber Rosa
2023-12-11 16:30 ` Philippe Mathieu-Daudé
2023-12-08 19:09 ` Cleber Rosa [this message]
2023-12-11 16:32 ` [PATCH 06/10] tests/avocado/kvm_xen_guest.py: cope with asset RW requirements Philippe Mathieu-Daudé
2024-08-01 3:30 ` Cleber Rosa
2024-08-01 12:57 ` Philippe Mathieu-Daudé
2024-08-01 15:17 ` Cleber Rosa
2024-08-02 13:14 ` Philippe Mathieu-Daudé
2023-12-08 19:09 ` [PATCH 07/10] testa/avocado: test_arm_emcraft_sf2: handle RW requirements for asset Cleber Rosa
2023-12-11 16:36 ` Philippe Mathieu-Daudé
2023-12-12 8:13 ` Akihiko Odaki
2023-12-08 19:09 ` [PATCH 08/10] tests/avocado/boot_xen.py: merge base classes Cleber Rosa
2023-12-08 19:09 ` [PATCH 09/10] tests/avocado/boot_xen.py: unify tags Cleber Rosa
2023-12-11 16:37 ` Philippe Mathieu-Daudé
2023-12-08 19:09 ` [PATCH 10/10] tests/avocado/boot_xen.py: use class attribute Cleber Rosa
2023-12-11 16:38 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231208190911.102879-7-crosa@redhat.com \
--to=crosa@redhat.com \
--cc=akihiko.odaki@daynix.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=dwmw2@infradead.org \
--cc=jiaxun.yang@flygoat.com \
--cc=kvm@vger.kernel.org \
--cc=marcin.juszkiewicz@linaro.org \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quic_llindhol@quicinc.com \
--cc=rad@semihalf.com \
--cc=sriram.yagnaraman@est.tech \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).