[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are prese
From: |
Michael S. Tsirkin |
Subject: |
Re: [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present |
Date: |
Fri, 10 Mar 2023 05:08:37 -0500 |
On Thu, Mar 09, 2023 at 05:14:31PM -0300, Fabiano Rosas wrote:
> It is possible to have a build with both TCG and KVM disabled due to
> Xen requiring the i386 and x86_64 binaries to be present in an aarch64
> host.
>
> If we build with --disable-tcg on the aarch64 host, we will end-up
> with a QEMU binary (x86) that does not support TCG nor KVM.
>
> Fix tests that crash or hang in the above scenario. Do not include any
> test cases if TCG and KVM are missing.
>
> Make sure that calls to qtest_has_accel are placed after g_test_init
> in similar fashion to commit ae4b01b349 ("tests: Ensure TAP version is
> printed before other messages") to avoid TAP parsing errors.
>
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> Reviewed-by: Juan Quintela <quintela@redhat.com>
I don't like it that we are hard-coding the list of accelerators
like this. Make a wrapper?
> ---
> This currently affects Arm, but will also affect x86 after the xenpvh
> series gets merged. This patch fixes both scenarios.
> ---
> tests/qtest/bios-tables-test.c | 10 ++++++++--
> tests/qtest/boot-serial-test.c | 10 ++++++++++
> tests/qtest/migration-test.c | 9 ++++++++-
> tests/qtest/pxe-test.c | 7 ++++++-
> tests/qtest/vmgenid-test.c | 8 ++++++--
> 5 files changed, 38 insertions(+), 6 deletions(-)
>
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index d29a4e47af..5cbad2f29f 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -2109,8 +2109,7 @@ static void test_acpi_virt_oem_fields(void)
> int main(int argc, char *argv[])
> {
> const char *arch = qtest_get_arch();
> - const bool has_kvm = qtest_has_accel("kvm");
> - const bool has_tcg = qtest_has_accel("tcg");
> + bool has_kvm, has_tcg;
> char *v_env = getenv("V");
> int ret;
>
> @@ -2120,6 +2119,13 @@ int main(int argc, char *argv[])
>
> g_test_init(&argc, &argv, NULL);
>
> + has_kvm = qtest_has_accel("kvm");
> + has_tcg = qtest_has_accel("tcg");
> +
why are you moving these? init at declaration time is
generally cleaner.
> + if (!has_tcg && !has_kvm) {
> + return 0;
> + }
> +
> if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
> ret = boot_sector_init(disk);
> if (ret) {
> diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c
> index 3aef3a97a9..406b4421cc 100644
> --- a/tests/qtest/boot-serial-test.c
> +++ b/tests/qtest/boot-serial-test.c
> @@ -17,6 +17,9 @@
> #include "libqtest.h"
> #include "libqos/libqos-spapr.h"
>
> +static bool has_tcg;
> +static bool has_kvm;
> +
> static const uint8_t bios_avr[] = {
> 0x88, 0xe0, /* ldi r24, 0x08 */
> 0x80, 0x93, 0xc1, 0x00, /* sts 0x00C1, r24 ; Enable tx */
> @@ -287,6 +290,13 @@ int main(int argc, char *argv[])
>
> g_test_init(&argc, &argv, NULL);
>
> + has_tcg = qtest_has_accel("tcg");
> + has_kvm = qtest_has_accel("kvm");
> +
and here why do we need them global?
> + if (!has_tcg && !has_kvm) {
> + return 0;
> + }
> +
> for (i = 0; tests[i].arch != NULL; i++) {
> if (g_str_equal(arch, tests[i].arch) &&
> qtest_has_machine(tests[i].machine)) {
> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
> index d4ab3934ed..7eedee7b2d 100644
> --- a/tests/qtest/migration-test.c
> +++ b/tests/qtest/migration-test.c
> @@ -2459,7 +2459,7 @@ static bool kvm_dirty_ring_supported(void)
>
> int main(int argc, char **argv)
> {
> - const bool has_kvm = qtest_has_accel("kvm");
> + bool has_kvm, has_tcg;
> const bool has_uffd = ufd_version_check();
> const char *arch = qtest_get_arch();
> g_autoptr(GError) err = NULL;
> @@ -2467,6 +2467,13 @@ int main(int argc, char **argv)
>
> g_test_init(&argc, &argv, NULL);
>
> + has_kvm = qtest_has_accel("kvm");
> + has_tcg = qtest_has_accel("tcg");
> +
same. why the move?
> + if (!has_tcg && !has_kvm) {
> + return 0;
> + }
> +
> /*
> * On ppc64, the test only works with kvm-hv, but not with kvm-pr and TCG
> * is touchy due to race conditions on dirty bits (especially on PPC for
> diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c
> index 62b6eef464..935b661dac 100644
> --- a/tests/qtest/pxe-test.c
> +++ b/tests/qtest/pxe-test.c
> @@ -131,11 +131,16 @@ int main(int argc, char *argv[])
> int ret;
> const char *arch = qtest_get_arch();
>
> + g_test_init(&argc, &argv, NULL);
> +
> + if (!qtest_has_accel("tcg") && !qtest_has_accel("kvm")) {
> + return 0;
> + }
> +
> ret = boot_sector_init(disk);
> if(ret)
> return ret;
>
> - g_test_init(&argc, &argv, NULL);
>
> if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
> test_batch(x86_tests, false);
> diff --git a/tests/qtest/vmgenid-test.c b/tests/qtest/vmgenid-test.c
> index efba76e716..9eb6371ae8 100644
> --- a/tests/qtest/vmgenid-test.c
> +++ b/tests/qtest/vmgenid-test.c
> @@ -165,13 +165,17 @@ int main(int argc, char **argv)
> {
> int ret;
>
> + g_test_init(&argc, &argv, NULL);
> +
> + if (!qtest_has_accel("tcg") && !qtest_has_accel("kvm")) {
> + return 0;
> + }
> +
> ret = boot_sector_init(disk);
> if (ret) {
> return ret;
> }
>
> - g_test_init(&argc, &argv, NULL);
> -
> qtest_add_func("/vmgenid/vmgenid/set-guid",
> vmgenid_set_guid_test);
> qtest_add_func("/vmgenid/vmgenid/set-guid-auto",
> --
> 2.35.3
- [PATCH v8 01/11] target/arm: Move cortex sysregs into a separate file, (continued)
- [PATCH v8 01/11] target/arm: Move cortex sysregs into a separate file, Fabiano Rosas, 2023/03/09
- [PATCH v8 03/11] target/arm: Move aa32_max_features out of cpu_tcg.c, Fabiano Rosas, 2023/03/09
- [PATCH v8 02/11] target/arm: Move 64-bit TCG CPUs into tcg/, Fabiano Rosas, 2023/03/09
- [PATCH v8 04/11] target/arm: move cpu_tcg to tcg/cpu32.c, Fabiano Rosas, 2023/03/09
- [PATCH v8 07/11] gitlab-ci: Check building KVM-only aarch64 target, Fabiano Rosas, 2023/03/09
- [PATCH v8 06/11] arm/Kconfig: Do not build TCG-only boards on a KVM-only build, Fabiano Rosas, 2023/03/09
- [PATCH v8 05/11] arm/Kconfig: Always select SEMIHOSTING when TCG is present, Fabiano Rosas, 2023/03/09
- [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present, Fabiano Rosas, 2023/03/09
- Re: [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present,
Michael S. Tsirkin <=
- Re: [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present, Fabiano Rosas, 2023/03/10
- Re: [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present, Thomas Huth, 2023/03/10
- Re: [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present, Fabiano Rosas, 2023/03/10
- Re: [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present, Thomas Huth, 2023/03/10
- Re: [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present, Fabiano Rosas, 2023/03/10
Re: [PATCH v8 08/11] tests/qtest: Fix tests when no KVM or TCG are present, Michael S. Tsirkin, 2023/03/10
[PATCH v8 09/11] tests/avocado: Pass parameters to migration test, Fabiano Rosas, 2023/03/09