qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Thomas Huth <thuth@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Igor Mammedov <imammedo@redhat.com>
Subject: [PULL 02/29] tests: qtest: add qtest_has_accel() to check if tested binary supports accelerator
Date: Tue, 19 Oct 2021 07:19:43 -0400	[thread overview]
Message-ID: <20211019111923.679826-3-mst@redhat.com> (raw)
In-Reply-To: <20211019111923.679826-1-mst@redhat.com>

From: Igor Mammedov <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>
Message-Id: <20210902113551.461632-3-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/qtest/libqos/libqtest.h |  8 ++++++++
 tests/qtest/libqtest.c        | 27 +++++++++++++++++++++++++++
 meson.build                   |  6 ++++++
 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/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index 73f6b977a6..25aeea385b 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -922,6 +922,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 */
diff --git a/meson.build b/meson.build
index 6b7487b725..266b94644b 100644
--- a/meson.build
+++ b/meson.build
@@ -72,6 +72,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 ['aarch64']
-- 
MST



  parent reply	other threads:[~2021-10-19 11:27 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20211019140622.738008-1-mst@redhat.com>
2021-10-19 11:19 ` [PULL 00/29] pc,pci,virtio: features, fixes Michael S. Tsirkin
2021-10-19 11:19   ` [PULL 01/29] tests: acpi: dump table with failed checksum Michael S. Tsirkin
2021-10-19 11:19   ` Michael S. Tsirkin [this message]
2021-10-19 11:19   ` [PULL 03/29] tests: acpi: whitelist expected tables for acpi/q35/xapic testcase Michael S. Tsirkin
2021-10-19 11:19   ` [PULL 04/29] tests: acpi: q35: test for x2APIC entries in SRAT Michael S. Tsirkin
2021-10-19 11:19   ` [PULL 05/29] tests: acpi: update expected tables blobs Michael S. Tsirkin
2021-10-19 11:19   ` [PULL 06/29] tests: acpi: whitelist new expected table tests/data/acpi/q35/DMAR.dmar Michael S. Tsirkin
2021-10-19 11:19   ` [PULL 07/29] tests: acpi: add testcase for intel_iommu (DMAR table) Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 08/29] tests: acpi: add expected blob for DMAR table Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 09/29] tests: acpi: whitelist expected blobs for new acpi/q35/ivrs testcase Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 10/29] tests: acpi: add testcase for amd-iommu (IVRS table) Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 11/29] tests: acpi: update expected blobs Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 12/29] tests: acpi: arm/virt: drop redundant test_acpi_one() in test_acpi_virt_tcg() Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 13/29] tests: arm-cpu-features: use qtest_has_kvm() API Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 14/29] tests: migration-test: use qtest_has_accel() API Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 15/29] tests: bios-tables-test: use qtest_has_accel() API to register TCG only tests Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 16/29] vdpa: Skip protected ram IOMMU mappings Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 17/29] vdpa: Add vhost_vdpa_section_end Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 18/29] vdpa: Check for iova range at mappings changes Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 19/29] virtio-iommu: Remove the non transitional name Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 20/29] virtio-iommu: Drop base_name and change generic_name Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 21/29] libvhost-user: fix VHOST_USER_REM_MEM_REG skipping mmap_addr Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 22/29] vhost-user-rng: Add vhost-user-rng implementation Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 23/29] vhost-user-rng-pci: Add vhost-user-rng-pci implementation Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 24/29] docs: Add documentation for vhost based RNG implementation Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 25/29] vhost-user: fix duplicated notifier MR init Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 26/29] tests/acpi/bios-tables-test: add and allow changes to a new q35 DSDT table blob Michael S. Tsirkin
2021-10-19 11:20   ` [PULL 27/29] tests/acpi/pcihp: add unit tests for hotplug on multifunction bridges for q35 Michael S. Tsirkin
2021-10-19 11:21   ` [PULL 28/29] tests/acpi/bios-tables-test: update DSDT blob for multifunction bridge test Michael S. Tsirkin
2021-10-19 11:21   ` [PULL 29/29] failover: fix a regression introduced by JSON'ification of -device Michael S. Tsirkin
2021-10-19 14:07   ` [PULL 00/29] pc,pci,virtio: features, fixes Michael S. Tsirkin
2021-10-19 14:08   ` [PULL 30/29] vhost-user-blk-test: pass vhost-user socket fds to QSD Michael S. Tsirkin
2021-10-19 18:38   ` [PULL 00/29] pc,pci,virtio: features, fixes Richard Henderson
2021-10-20  8:39     ` Igor Mammedov
2021-10-20  9:39       ` Thomas Huth
2021-10-20  9:41         ` Michael S. Tsirkin
2021-10-20  9:46           ` Thomas Huth
2021-10-20 15:34           ` Marcel Apfelbaum

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=20211019111923.679826-3-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --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).