From nobody Wed Nov 19 22:15:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1618504447; cv=none; d=zohomail.com; s=zohoarc; b=fMCZrTSrk7i8R0Ho8oFWOn6ImR07B4mVwKHPZ9SDgGt/oSzpaM+ghjpQjAkTVLrkInsrkWn6+uMaq2Kl7HQxbEKcqv/yFNxIWycLg8CFqOcxMCr/wxtfBtMAKmVCdemcYD9inIzcdIPxfs/SIN+viNzJ333wAgAX1d0ol60hHkI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618504447; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=gXF3I2HiTrXmapky2sFUIdU4HSA6Nendcs7h4VxHKIw=; b=EYTnrQqNiEQD5qFwjXHjhLMmHuNJhfE593cFoD1tYpRv3Ep6waQ1BzyN0mzNFweE6D0HRlSH6u44xL2dqCkdtX1qcmYUPHeGJSvmxyiIiggMKSSU71I/ljiWa9R/+sH+2I/z78gjzMvpOzltZONGzQyr0JpB6UlzLljAFv4OW5M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1618504447539928.0193709626791; Thu, 15 Apr 2021 09:34:07 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-17-iRHx3wSgMomF7FNb_N2eIw-1; Thu, 15 Apr 2021 12:34:05 -0400 Received: by mail-wr1-f71.google.com with SMTP id 91-20020adf92e40000b029010470a9ebc4so1924847wrn.14 for ; Thu, 15 Apr 2021 09:34:05 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id j12sm4126038wro.29.2021.04.15.09.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Apr 2021 09:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618504446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gXF3I2HiTrXmapky2sFUIdU4HSA6Nendcs7h4VxHKIw=; b=QpYeCch5sWLnWOI2qZR6N5609QQrppTSPFfoiFgo721HIXFXMmLNxOHy0C2vxccxQrkIaN 7ST/mjZjDgCRuaom1IH6HLF04SOjC4RsVOaXVq/iuodXjK2NZfWf0fm3bMwDWpsKs0OM9A 0pNjljSfWZmCZJZ5OgHdOiSkrc2bY7A= X-MC-Unique: iRHx3wSgMomF7FNb_N2eIw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gXF3I2HiTrXmapky2sFUIdU4HSA6Nendcs7h4VxHKIw=; b=YKyzJPWCnicfQWu/wbBsF02oGVvS+syvaOCwTlqYgw0+hy7z83rDQHqEINYi47Lqec eGQJu43XiR13uhg//mTspd5PW9nmbEnFO67yljhbWmBny6qRPEG2dxuOw4j2ZROoqp4u 5CAcCBSFnq8vkVKF945LS83G4x/ShDU0aYDk5Q+drq6nvRjo/AD+kMCpWV2XVbHJ5gzv LGwUbtYY0pdnYzX61BjpIsQKSsVcif9qO20QFGB57iASeGYAtWj5NyL6VGm+lWL7kPG2 UGIVxluI1zSSwRNz+HRslfGJJ63TyY1fxfWpb6SIIzbIIYUg1i3wMaobRMIGiTGgPc7s zoVw== X-Gm-Message-State: AOAM5329zrUIlCiJT5JGimaXUlhKip829kVdfDW6G6jz8RFS5/j8xxiD Nib/wPXujzukG9MLg0HTpfvNGQoeuZDO7wC8L/T0FJwDXx/JLAxmNaNp8UdLwhjmlJPVunIA5n4 qUKoSmMVlmnV2LA== X-Received: by 2002:a05:600c:2211:: with SMTP id z17mr4007989wml.41.1618504443670; Thu, 15 Apr 2021 09:34:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyiFxh9zumaQT2ovO0zmmObHaJ8LmOOcmECLKoRsmflXTp/tWLdjOFpqSK1HJvzeKu63tBqYw== X-Received: by 2002:a05:600c:2211:: with SMTP id z17mr4007963wml.41.1618504443538; Thu, 15 Apr 2021 09:34:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Claudio Fontana , Igor Mammedov , Eduardo Habkost , qemu-arm@nongnu.org, Paolo Bonzini , Marcel Apfelbaum , Markus Armbruster , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Laurent Vivier , Andrew Jones , Richard Henderson , Juan Quintela , Thomas Huth , Peter Maydell , "Dr. David Alan Gilbert" , Eric Blake , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 10/12] qtest/qmp-cmd-test: Make test build-independent from accelerator Date: Thu, 15 Apr 2021 18:33:02 +0200 Message-Id: <20210415163304.4120052-11-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210415163304.4120052-1-philmd@redhat.com> References: <20210415163304.4120052-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Now than we can probe if the TCG accelerator is available at runtime with a QMP command, do it once at the beginning and only register the tests we can run. We can then replace the #ifdef'ry by a runtime check. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/qmp-cmd-test.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c index c98b78d0339..8902d2f169f 100644 --- a/tests/qtest/qmp-cmd-test.c +++ b/tests/qtest/qmp-cmd-test.c @@ -21,19 +21,24 @@ const char common_args[] =3D "-nodefaults -machine none= "; =20 /* Query smoke tests */ =20 +static bool tcg_accel_available; + static int query_error_class(const char *cmd) { - static struct { + static const struct { const char *cmd; int err_class; + /* + * Pointer to boolean. + * If non-NULL and value is %true, the error class is skipped. + */ + bool *skip_err_class; } fails[] =3D { /* Success depends on build configuration: */ #ifndef CONFIG_SPICE { "query-spice", ERROR_CLASS_COMMAND_NOT_FOUND }, #endif -#ifndef CONFIG_TCG - { "query-replay", ERROR_CLASS_COMMAND_NOT_FOUND }, -#endif + { "query-replay", ERROR_CLASS_COMMAND_NOT_FOUND, &tcg_accel_availa= ble }, #ifndef CONFIG_VNC { "query-vnc", ERROR_CLASS_GENERIC_ERROR }, { "query-vnc-servers", ERROR_CLASS_GENERIC_ERROR }, @@ -51,6 +56,9 @@ static int query_error_class(const char *cmd) int i; =20 for (i =3D 0; fails[i].cmd; i++) { + if (fails[i].skip_err_class && *fails[i].skip_err_class) { + continue; + } if (!strcmp(cmd, fails[i].cmd)) { return fails[i].err_class; } @@ -334,6 +342,8 @@ int main(int argc, char *argv[]) QmpSchema schema; int ret; =20 + tcg_accel_available =3D qtest_has_accel("tcg"); + g_test_init(&argc, &argv, NULL); =20 qmp_schema_init(&schema); --=20 2.26.3