| Message ID | 20231114143816.71079-2-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/xen: Have most of Xen files become target-agnostic | expand |
On 14 November 2023 09:37:57 GMT-05:00, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote: >Add a tag to run all Xen-specific tests using: > > $ make check-avocado AVOCADO_TAGS='guest:xen' > >Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >--- > tests/avocado/boot_xen.py | 3 +++ > tests/avocado/kvm_xen_guest.py | 1 + > 2 files changed, 4 insertions(+) Those two are very different. One runs on Xen, the other on KVM. Do we want to use the same tag for both?
On 14/11/23 15:50, David Woodhouse wrote: > On 14 November 2023 09:37:57 GMT-05:00, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote: >> Add a tag to run all Xen-specific tests using: >> >> $ make check-avocado AVOCADO_TAGS='guest:xen' >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> --- >> tests/avocado/boot_xen.py | 3 +++ >> tests/avocado/kvm_xen_guest.py | 1 + >> 2 files changed, 4 insertions(+) > > Those two are very different. One runs on Xen, the other on KVM. Do we want to use the same tag for both? My understanding is, - boot_xen.py runs Xen on TCG - kvm_xen_guest.py runs Xen on KVM so both runs Xen guests. Alex, is that incorrect?
On 14 November 2023 10:00:09 GMT-05:00, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote: >On 14/11/23 15:50, David Woodhouse wrote: >> On 14 November 2023 09:37:57 GMT-05:00, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote: >>> Add a tag to run all Xen-specific tests using: >>> >>> $ make check-avocado AVOCADO_TAGS='guest:xen' >>> >>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>> --- >>> tests/avocado/boot_xen.py | 3 +++ >>> tests/avocado/kvm_xen_guest.py | 1 + >>> 2 files changed, 4 insertions(+) >> >> Those two are very different. One runs on Xen, the other on KVM. Do we want to use the same tag for both? > >My understanding is, >- boot_xen.py runs Xen on TCG >- kvm_xen_guest.py runs Xen on KVM >so both runs Xen guests. Does boot_xen.py actually boot *Xen*? And presumably at least one Xen guest *within* Xen? kvm_xen_guest.py boots a "Xen guest" under KVM directly without any real Xen being present. It's *emulating* Xen. They do both run Xen guests (or at least guests which use Xen hypercalls and *think* they're running under Xen). But is that the important classification for lumping them together?
On 14/11/23 16:08, David Woodhouse wrote: > On 14 November 2023 10:00:09 GMT-05:00, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote: >> On 14/11/23 15:50, David Woodhouse wrote: >>> On 14 November 2023 09:37:57 GMT-05:00, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote: >>>> Add a tag to run all Xen-specific tests using: >>>> >>>> $ make check-avocado AVOCADO_TAGS='guest:xen' >>>> >>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>>> --- >>>> tests/avocado/boot_xen.py | 3 +++ >>>> tests/avocado/kvm_xen_guest.py | 1 + >>>> 2 files changed, 4 insertions(+) >>> >>> Those two are very different. One runs on Xen, the other on KVM. Do we want to use the same tag for both? >> >> My understanding is, >> - boot_xen.py runs Xen on TCG >> - kvm_xen_guest.py runs Xen on KVM >> so both runs Xen guests. > > Does boot_xen.py actually boot *Xen*? And presumably at least one Xen guest *within* Xen? I'll let Alex confirm, but yes, I expect Xen guest within Xen guest within TCG. So the tags "accel:tcg" (already present) and "guest:xen". > kvm_xen_guest.py boots a "Xen guest" under KVM directly without any real Xen being present. It's *emulating* Xen. Yes, so the tag "guest:xen" is correct. > They do both run Xen guests (or at least guests which use Xen hypercalls and *think* they're running under Xen). But is that the important classification for lumping them together? The idea of AVOCADO_TAGS is to restrict testing to what you want to cover. So here this allow running 'anything that can run Xen guest' in a single command, for example it is handy on my macOS aarch64 host.
On 14 November 2023 10:13:14 GMT-05:00, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote: >On 14/11/23 16:08, David Woodhouse wrote: >> On 14 November 2023 10:00:09 GMT-05:00, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote: >>> On 14/11/23 15:50, David Woodhouse wrote: >>>> On 14 November 2023 09:37:57 GMT-05:00, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote: >>>>> Add a tag to run all Xen-specific tests using: >>>>> >>>>> $ make check-avocado AVOCADO_TAGS='guest:xen' >>>>> >>>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>>>> --- >>>>> tests/avocado/boot_xen.py | 3 +++ >>>>> tests/avocado/kvm_xen_guest.py | 1 + >>>>> 2 files changed, 4 insertions(+) >>>> >>>> Those two are very different. One runs on Xen, the other on KVM. Do we want to use the same tag for both? >>> >>> My understanding is, >>> - boot_xen.py runs Xen on TCG >>> - kvm_xen_guest.py runs Xen on KVM >>> so both runs Xen guests. >> >> Does boot_xen.py actually boot *Xen*? And presumably at least one Xen guest *within* Xen? > >I'll let Alex confirm, but yes, I expect Xen guest within Xen guest within TCG. So the tags "accel:tcg" (already present) and "guest:xen". > >> kvm_xen_guest.py boots a "Xen guest" under KVM directly without any real Xen being present. It's *emulating* Xen. > >Yes, so the tag "guest:xen" is correct. > >> They do both run Xen guests (or at least guests which use Xen hypercalls and *think* they're running under Xen). But is that the important classification for lumping them together? > >The idea of AVOCADO_TAGS is to restrict testing to what you want to cover. So here this allow running 'anything that can run Xen guest' >in a single command, for example it is handy on my macOS aarch64 host. Ok, that makes sense then. Thanks for your patience. Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>
On 14/11/23 16:19, David Woodhouse wrote: > On 14 November 2023 10:13:14 GMT-05:00, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote: >> On 14/11/23 16:08, David Woodhouse wrote: >>> On 14 November 2023 10:00:09 GMT-05:00, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote: >>>> On 14/11/23 15:50, David Woodhouse wrote: >>>>> On 14 November 2023 09:37:57 GMT-05:00, "Philippe Mathieu-Daudé" <philmd@linaro.org> wrote: >>>>>> Add a tag to run all Xen-specific tests using: >>>>>> >>>>>> $ make check-avocado AVOCADO_TAGS='guest:xen' >>>>>> >>>>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>>>>> --- >>>>>> tests/avocado/boot_xen.py | 3 +++ >>>>>> tests/avocado/kvm_xen_guest.py | 1 + >>>>>> 2 files changed, 4 insertions(+) >>>>> >>>>> Those two are very different. One runs on Xen, the other on KVM. Do we want to use the same tag for both? >>>> >>>> My understanding is, >>>> - boot_xen.py runs Xen on TCG >>>> - kvm_xen_guest.py runs Xen on KVM >>>> so both runs Xen guests. >>> >>> Does boot_xen.py actually boot *Xen*? And presumably at least one Xen guest *within* Xen? >> >> I'll let Alex confirm, but yes, I expect Xen guest within Xen guest within TCG. So the tags "accel:tcg" (already present) and "guest:xen". >> >>> kvm_xen_guest.py boots a "Xen guest" under KVM directly without any real Xen being present. It's *emulating* Xen. >> >> Yes, so the tag "guest:xen" is correct. >> >>> They do both run Xen guests (or at least guests which use Xen hypercalls and *think* they're running under Xen). But is that the important classification for lumping them together? >> >> The idea of AVOCADO_TAGS is to restrict testing to what you want to cover. So here this allow running 'anything that can run Xen guest' >> in a single command, for example it is handy on my macOS aarch64 host. > > Ok, that makes sense then. Thanks for your patience. No problem, I'll add a better description in v3. > Reviewed-by: David Woodhouse <dwmw@amazon.co.uk> Thanks!
diff --git a/tests/avocado/boot_xen.py b/tests/avocado/boot_xen.py index fc2faeedb5..f7f35d4740 100644 --- a/tests/avocado/boot_xen.py +++ b/tests/avocado/boot_xen.py @@ -61,6 +61,9 @@ def launch_xen(self, xen_path): class BootXen(BootXenBase): + """ + :avocado: tags=guest:xen + """ def test_arm64_xen_411_and_dom0(self): """ diff --git a/tests/avocado/kvm_xen_guest.py b/tests/avocado/kvm_xen_guest.py index 5391283113..63607707d6 100644 --- a/tests/avocado/kvm_xen_guest.py +++ b/tests/avocado/kvm_xen_guest.py @@ -22,6 +22,7 @@ class KVMXenGuest(QemuSystemTest, LinuxSSHMixIn): :avocado: tags=arch:x86_64 :avocado: tags=machine:q35 :avocado: tags=accel:kvm + :avocado: tags=guest:xen :avocado: tags=kvm_xen_guest """
Add a tag to run all Xen-specific tests using: $ make check-avocado AVOCADO_TAGS='guest:xen' Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- tests/avocado/boot_xen.py | 3 +++ tests/avocado/kvm_xen_guest.py | 1 + 2 files changed, 4 insertions(+)