qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Laurent Vivier" <lvivier@redhat.com>,
	"Fabiano Rosas" <farosas@suse.de>,
	"Juan Quintela" <quintela@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	qemu-arm@nongnu.org, "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 3/8] tests/qtest/boot-serial-test: Only use available accelerators
Date: Thu, 19 Jan 2023 11:05:32 +0100	[thread overview]
Message-ID: <20230119100537.5114-4-philmd@linaro.org> (raw)
In-Reply-To: <20230119100537.5114-1-philmd@linaro.org>

For example, avoid when TCG is disabled:

  $ make check-qtest-aarch64
  ...
  18/20 qemu:qtest+qtest-aarch64 / qtest-aarch64/boot-serial-test
  qemu-system-aarch64: -accel tcg: invalid accelerator tcg

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 tests/qtest/boot-serial-test.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c
index fccf706f99..f8d0c684c2 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 */
@@ -264,8 +267,12 @@ static void test_machine(const void *data)
      * Make sure that this test uses tcg if available: It is used as a
      * fast-enough smoketest for that.
      */
-    g_string_append(cmd, "-accel tcg ");
-    g_string_append(cmd, "-accel kvm ");
+    if (has_tcg) {
+        g_string_append(cmd, "-accel tcg ");
+    }
+    if (has_kvm) {
+        g_string_append(cmd, "-accel kvm ");
+    }
     g_string_append(cmd, test->extra);
 
     qts = qtest_init(cmd->str);
@@ -292,6 +299,9 @@ int main(int argc, char *argv[])
     const char *arch = qtest_get_arch();
     int i;
 
+    has_tcg = qtest_has_accel("tcg");
+    has_kvm = qtest_has_accel("kvm");
+
     g_test_init(&argc, &argv, NULL);
 
     for (i = 0; tests[i].arch != NULL; i++) {
-- 
2.38.1



  parent reply	other threads:[~2023-01-19 10:13 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-19 10:05 [PATCH 0/8] tests/qtest: Allow running boot-serial / migration with TCG disabled Philippe Mathieu-Daudé
2023-01-19 10:05 ` [PATCH 1/8] tests/qtest/boot-serial-test: Constify tests[] array Philippe Mathieu-Daudé
2023-01-19 10:05 ` [PATCH 2/8] tests/qtest/boot-serial-test: Build command line using GString API Philippe Mathieu-Daudé
2023-01-19 10:05 ` Philippe Mathieu-Daudé [this message]
2023-01-19 10:05 ` [PATCH 4/8] tests/qtest/migration-test: " Philippe Mathieu-Daudé
2023-01-19 10:59   ` Dr. David Alan Gilbert
2023-01-19 11:15     ` Philippe Mathieu-Daudé
2023-01-19 10:05 ` [PATCH 5/8] tests/qtest/migration-test: Only use available accelerators Philippe Mathieu-Daudé
2023-01-19 11:08   ` Dr. David Alan Gilbert
2023-01-19 10:05 ` [RFC PATCH 6/8] tests/qtest/libqtest: Allow checking for HVF accelerator Philippe Mathieu-Daudé
2023-01-19 11:24   ` Thomas Huth
2023-01-19 11:30     ` Philippe Mathieu-Daudé
2023-01-19 12:05       ` Thomas Huth
2023-01-20 10:26         ` Thomas Huth
2023-01-20 11:18           ` Philippe Mathieu-Daudé
2023-01-20 11:39             ` Thomas Huth
2023-01-19 16:21     ` Thomas Huth
2023-01-19 10:05 ` [PATCH 7/8] tests/qtest/boot-serial-test: Allow running with HVF Philippe Mathieu-Daudé
2023-01-19 10:05 ` [PATCH 8/8] tests/qtest/migration-test: " Philippe Mathieu-Daudé
2023-01-19 11:13   ` Dr. David Alan Gilbert
2023-01-19 11:31     ` Philippe Mathieu-Daudé

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=20230119100537.5114-4-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=dgilbert@redhat.com \
    --cc=farosas@suse.de \
    --cc=lvivier@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --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).