On 1/15/25 15:06, Thomas Huth wrote:
> On 14/01/2025 14.07, Michal Privoznik wrote:
>> In its upstream commit [1], qemu dropped s390-2.7 machine type,
>> then in commit [2] the s390-2.8 machine type was dropped.
>> Therefore, switch both tests to s390-2.9 which is still available
>> (though deprecated).
>
> I already posted some patches to remove 2.9 - 2.12, too:
>
> https://lore.kernel.org/qemu-devel/20250115073819.15452-1-
> th...@redhat.com/
>
> Actually, every machine type that is older than 6 years is now scheduled
> for removal:
>
> https://gitlab.com/qemu-project/qemu/-/commit/ce80c4fa6ff
>
> So maybe it's best if you update this patch to use a 4.x or even 5.x
> machine type instead?
>
> Thomas
>
Good point! We already have a test case for 4.2 machine type:
DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-kvm-ccw-virtio-4.2", "s390x");
DO_TEST_CAPS_ARCH_LATEST("s390-default-cpu-tcg-ccw-virtio-4.2", "s390x");
https://gitlab.com/libvirt/libvirt/-/blob/master/tests/qemuxmlconftest.c?ref_type=heads#L2927
Having said that, I think these 2.x test cases can be just dropped.
Michal
