qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: lvivier@redhat.com, thuth@redhat.com, f4bug@amsat.org, mst@redhat.com
Subject: [PATCH 02/53] tests: qtest: add qtest_has_accel() to check if tested binary supports accelerator
Date: Fri, 25 Jun 2021 05:17:26 -0400	[thread overview]
Message-ID: <20210625091818.1047980-3-imammedo@redhat.com> (raw)
In-Reply-To: <20210625091818.1047980-1-imammedo@redhat.com>

Currently it is not possible to create tests that have KVM as a hard
requirement on a host that doesn't support KVM for tested target
binary (modulo going through the trouble of compiling out
the offending test case).

Following scenario makes test fail when it's run on non x86 host:
  qemu-system-x86_64 -enable-kvm -M q35,kernel-irqchip=on -smp 1,maxcpus=288

This patch introduces qtest_has_accel() to let users check if accel is
available in advance and avoid executing non run-able test-cases.

It implements detection of TCG and KVM only, the rest could be
added later on, when we actually start testing them in qtest.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
PS:
There is an alternative 'runtime' approach on list:
'query-accels' series.
https://patchwork.kernel.org/project/qemu-devel/patch/20210503211020.894589-4-philmd@redhat.com/

on upside this impl. much cheaper to execute than the 'query-accels'
as it doesn't need to run QEMU for probing.

v4:
  - s/qtest_has_kvm/qtest_has_accel/
  - add TCG detection (based on --disable-tcg)
v3:
  - make it work with --disable-kvm
       (Claudio Fontana <cfontana@suse.de>)
v2:
  - fix access() check.
     s/access()/!access()/
  - format C array items at meson.build time

CC: thuth@redhat.com
CC: lvivier@redhat.com
CC: f4bug@amsat.org
---
 tests/qtest/libqos/libqtest.h |  8 ++++++++
 meson.build                   |  6 ++++++
 tests/qtest/libqtest.c        | 27 +++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/tests/qtest/libqos/libqtest.h b/tests/qtest/libqos/libqtest.h
index a68dcd79d4..59e9271195 100644
--- a/tests/qtest/libqos/libqtest.h
+++ b/tests/qtest/libqos/libqtest.h
@@ -588,6 +588,14 @@ bool qtest_big_endian(QTestState *s);
  */
 const char *qtest_get_arch(void);
 
+/**
+ * qtest_has_accel:
+ * @accel_name: Accelerator name to check for.
+ *
+ * Returns: true if the accelerator is built in.
+ */
+bool qtest_has_accel(const char *accel_name);
+
 /**
  * qtest_add_func:
  * @str: Test case path.
diff --git a/meson.build b/meson.build
index d8a92666fb..7eeb201179 100644
--- a/meson.build
+++ b/meson.build
@@ -76,6 +76,12 @@ else
   kvm_targets = []
 endif
 
+kvm_targets_c = ''
+if not get_option('kvm').disabled() and targetos == 'linux'
+  kvm_targets_c = '"' + '" ,"'.join(kvm_targets) + '"'
+endif
+config_host_data.set('CONFIG_KVM_TARGETS', kvm_targets_c)
+
 accelerator_targets = { 'CONFIG_KVM': kvm_targets }
 if cpu in ['x86', 'x86_64', 'arm', 'aarch64']
   # i368 emulator provides xenpv machine type for multiple architectures
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index 825b13a44c..643769e416 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -920,6 +920,33 @@ const char *qtest_get_arch(void)
     return end + 1;
 }
 
+bool qtest_has_accel(const char *accel_name)
+{
+    if (g_str_equal(accel_name, "tcg")) {
+#if defined(CONFIG_TCG)
+        return true;
+#else
+        return false;
+#endif
+    } else if (g_str_equal(accel_name, "kvm")) {
+        int i;
+        const char *arch = qtest_get_arch();
+        const char *targets[] = { CONFIG_KVM_TARGETS };
+
+        for (i = 0; i < ARRAY_SIZE(targets); i++) {
+            if (!strncmp(targets[i], arch, strlen(arch))) {
+                if (!access("/dev/kvm", R_OK | W_OK)) {
+                    return true;
+                }
+            }
+        }
+    } else {
+        /* not implemented */
+        g_assert_not_reached();
+    }
+    return false;
+}
+
 bool qtest_get_irq(QTestState *s, int num)
 {
     /* dummy operation in order to make sure irq is up to date */
-- 
2.27.0



  parent reply	other threads:[~2021-06-25  9:23 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-25  9:17 [PATCH 00/53] acpi: refactor error prone build_header() and packed structures usage in ACPI tables Igor Mammedov
2021-06-25  9:17 ` [PATCH 01/53] tests: acpi: dump table with failed checksum Igor Mammedov
2021-06-25  9:17 ` Igor Mammedov [this message]
2021-06-25  9:33   ` [PATCH 02/53] tests: qtest: add qtest_has_accel() to check if tested binary supports accelerator Philippe Mathieu-Daudé
2021-06-25  9:17 ` [PATCH 03/53] tests: acpi: whitelist expected tables for acpi/q35/numamem testcase Igor Mammedov
2021-06-25  9:17 ` [PATCH 04/53] tests: acpi: q35: test for x2APIC entries in SRAT Igor Mammedov
2021-07-02 14:45   ` Michael S. Tsirkin
2021-07-08  9:18     ` Igor Mammedov
2021-07-08 11:59       ` Michael S. Tsirkin
2021-06-25  9:17 ` [PATCH 05/53] tests: acpi: update expected tables blobs Igor Mammedov
2021-06-25  9:17 ` [PATCH 06/53] tests: acpi: whitelist new expected table tests/data/acpi/q35/DMAR.dmar Igor Mammedov
2021-06-25  9:17 ` [PATCH 07/53] tests: acpi: add testcase for intel_iommu (DMAR table) Igor Mammedov
2021-06-25  9:17 ` [PATCH 08/53] tests: acpi: add expected blob for DMAR table Igor Mammedov
2021-06-25  9:17 ` [PATCH 09/53] tests: acpi: whitelist expected blobs for new acpi/q35/ivrs testcase Igor Mammedov
2021-06-25  9:17 ` [PATCH 10/53] tests: acpi: add testcase for amd-iommu (IVRS table) Igor Mammedov
2021-06-25  9:17 ` [PATCH 11/53] tests: acpi: update expected blobs Igor Mammedov
2021-06-25  9:17 ` [PATCH 12/53] tests: acpi: arm/virt: drop redudant test_acpi_one() in test_acpi_virt_tcg() Igor Mammedov
2021-06-25  9:17 ` [PATCH 12/53] tests: acpi: arm/virt: drop redundant " Igor Mammedov
2021-06-25  9:17 ` [PATCH 13/53] tests: acpi: whitelist expected tables for acpi/virt/iort testcase Igor Mammedov
2021-06-25  9:17 ` [PATCH 14/53] tests: acpi: arm/virt: use kvm to test IORT table Igor Mammedov
2021-06-25  9:17 ` [PATCH 15/53] tests: acpi: add expected IORT table blob Igor Mammedov
2021-06-25  9:17 ` [PATCH 16/53] tests: arm-cpu-features: use qtest_has_kvm() API Igor Mammedov
2021-06-25  9:17 ` [PATCH 17/53] tests: migration-test: use qtest_has_accel() API Igor Mammedov
2021-06-25  9:17 ` [PATCH 18/53] tests: bios-tables-test: use qtest_has_accel() API to register TCG only tests Igor Mammedov
2021-06-25  9:17 ` [PATCH 19/53] acpi: add helper routines to initialize ACPI tables Igor Mammedov
2021-06-29 19:16   ` Michael S. Tsirkin
2021-06-30  6:32     ` Igor Mammedov
2021-06-25  9:17 ` [PATCH 20/53] acpi: build_rsdt: use acpi_init_table()/acpi_table_composed() instead of build_header() Igor Mammedov
2021-06-25  9:17 ` [PATCH 21/53] acpi: build_xsdt: " Igor Mammedov
2021-06-25  9:17 ` [PATCH 22/53] acpi: build_slit: " Igor Mammedov
2021-06-25  9:17 ` [PATCH 23/53] acpi: build_fadt: " Igor Mammedov
2021-06-25  9:17 ` [PATCH 24/53] acpi: build_tpm2: " Igor Mammedov
2021-06-29 14:56   ` Stefan Berger
2021-06-25  9:17 ` [PATCH 25/53] acpi: acpi_build_hest: " Igor Mammedov
2021-07-02 12:21   ` Dongjiu Geng
2021-06-25  9:17 ` [PATCH 26/53] acpi: build_mcfg: " Igor Mammedov
2021-06-25  9:17 ` [PATCH 27/53] acpi: build_hmat: " Igor Mammedov
2021-06-25  9:17 ` [PATCH 28/53] acpi: nvdimm_build_nfit: " Igor Mammedov
2021-06-25  9:17 ` [PATCH 29/53] acpi: nvdimm_build_ssdt: " Igor Mammedov
2021-06-25  9:17 ` [PATCH 30/53] acpi: vmgenid_build_acpi: " Igor Mammedov
2021-06-25  9:17 ` [PATCH 31/53] acpi: x86: build_dsdt: " Igor Mammedov
2021-06-25  9:17 ` [PATCH 32/53] acpi: build_hpet: " Igor Mammedov
2021-06-25  9:17 ` [PATCH 33/53] acpi: build_tpm_tcpa: " Igor Mammedov
2021-06-29 15:19   ` Stefan Berger
2021-06-30  7:22     ` Igor Mammedov
2021-06-30  7:25   ` [PATCH v2 " Igor Mammedov
2021-06-30 12:21     ` Stefan Berger
2021-06-25  9:17 ` [PATCH 34/53] acpi: arm/x86: build_srat: " Igor Mammedov
2021-06-25  9:18 ` [PATCH 35/53] acpi: use build_append_int_noprefix() API to compose SRAT table Igor Mammedov
2021-06-25  9:18 ` [PATCH 36/53] acpi: build_dmar_q35: use acpi_init_table()/acpi_table_composed() instead of build_header() Igor Mammedov
2021-06-25  9:18 ` [PATCH 37/53] acpi: build_waet: " Igor Mammedov
2021-06-25  9:18 ` [PATCH 38/53] acpi: build_amd_iommu: " Igor Mammedov
2021-06-25  9:18 ` [PATCH 39/53] acpi: madt: arm/x86: " Igor Mammedov
2021-06-25  9:18 ` [PATCH 40/53] acpi: x86: remove dead code Igor Mammedov
2021-06-25  9:18 ` [PATCH 41/53] acpi: x86: set enabled when composing _MAT entries Igor Mammedov
2021-06-25  9:18 ` [PATCH 42/53] acpi: x86: madt: use build_append_int_noprefix() API to compose MADT table Igor Mammedov
2021-06-25  9:18 ` [PATCH 43/53] acpi: arm/virt: " Igor Mammedov
2021-06-25  9:18 ` [PATCH 44/53] acpi: build_dsdt_microvm: use acpi_init_table()/acpi_table_composed() instead of build_header() Igor Mammedov
2021-06-25  9:18 ` [PATCH 45/53] acpi: arm: virt: build_dsdt: " Igor Mammedov
2021-06-25  9:18 ` [PATCH 46/53] acpi: arm: virt: build_iort: " Igor Mammedov
2021-06-25  9:18 ` [PATCH 47/53] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API Igor Mammedov
2021-06-25  9:18 ` [PATCH 48/53] acpi: arm/virt: build_spcr: fix invalid cast Igor Mammedov
2021-06-25  9:18 ` [PATCH 49/53] acpi: arm/virt: build_spcr: use acpi_init_table()/acpi_table_composed() instead of build_header() Igor Mammedov
2021-06-25  9:18 ` [PATCH 50/53] acpi: arm/virt: build_gtdt: " Igor Mammedov
2021-06-25  9:18 ` [PATCH 51/53] acpi: build_facs: use build_append_int_noprefix() API to compose table Igor Mammedov
2021-06-25  9:18 ` [PATCH 52/53] acpi: remove no longer used build_header() Igor Mammedov
2021-06-25  9:18 ` [PATCH 53/53] acpi: AcpiGenericAddress no longer used to map/access fields of MMIO, drop packed attribute Igor Mammedov
2021-07-02 14:47 ` [PATCH 00/53] acpi: refactor error prone build_header() and packed structures usage in ACPI tables Michael S. Tsirkin
2021-07-05  7:56   ` Igor Mammedov
2021-07-05 18:00     ` Michael S. Tsirkin
2021-07-07  9:11       ` Igor Mammedov

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=20210625091818.1047980-3-imammedo@redhat.com \
    --to=imammedo@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=lvivier@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@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).