From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9C3CC433DB for ; Thu, 11 Mar 2021 23:17:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4B68E64F9A for ; Thu, 11 Mar 2021 23:17:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4B68E64F9A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKUZ4-0000Km-AY for qemu-devel@archiver.kernel.org; Thu, 11 Mar 2021 18:17:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKUU1-0001oQ-FZ for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:40129) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKUTo-00056O-J8 for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615504350; 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=HdOBjBLcdbMXP51scg5DrlFZj8mW1XPQm5WfkP9UVng=; b=MkNnYem2Lb7HW81MmLrkVHzTDPe/3R1NbySdrLUVHgxfogEn3+WXonAnrwV/8jsXl1sSOD VORk5eW8a2vWAxcUUWQdjxwVYQ7RItwre6+l46AzTeE+gLfWtaAZzv9ygqTtbhrWD6n7ND AkmgvnaPadGkN4xS7sZ6uAkAC+a4z6o= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-56-s9zCKpiyNS6-r-Ta12dBYg-1; Thu, 11 Mar 2021 18:12:28 -0500 X-MC-Unique: s9zCKpiyNS6-r-Ta12dBYg-1 Received: by mail-wm1-f70.google.com with SMTP id c7so4641952wml.8 for ; Thu, 11 Mar 2021 15:12:28 -0800 (PST) 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=HdOBjBLcdbMXP51scg5DrlFZj8mW1XPQm5WfkP9UVng=; b=UAtrC3il/gKoS08iSz8NxyX9TxuUjuSKcIjUDuClAPCzD3nV/dGWHsPc2y44z1q2wK Uam4cyoDm5N0qCz+Gtkv/Z248C35urnhGCUxdpgkJAQkz7ZyF3xHvyu+N2OhE2277x3r 4eIAw+HbDiso5Wa/nTrkEpBOUTdL0wplgF7Ah+0lpYICHBFyry77j+JBvlN5v27wgPzT PguFfwF8Apkwvp2lcg4ccgpt50IvWtwgU5p+L9rnJfE9RU6XvNGB8iwsdgXY5vKwIHou RcFW2Zzi35/McVWi2ly0bdFoshku0d3wL5xdCVFMhgPxDL++jiiVMQjCPUh9+Uym+vGG 0uXg== X-Gm-Message-State: AOAM530m9Q5CepgeDbP++86P0lNDc0YTR8aGru0SCWx+oIHgcM6037r+ y1zaXHh7LCysgrhapGvFveStJHalOn9HJjU5E8dLg9QlhuOQK84UDJlMvl8NoVzG3J2j+JkcF4h KZDZ4hhwf2KQv6xSp04Ty6oCCZn0ptAuayaNIysfPkxnwAikQzroouG4xkS2ucV4R X-Received: by 2002:adf:e5c4:: with SMTP id a4mr10992793wrn.174.1615504346609; Thu, 11 Mar 2021 15:12:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJxNLcz8VoON0vxaqyOVtbiqmCdBWPfk5PvjWnFcoWLBjEfFWyJmi8qYRwdZSaKQEGQYK1R38w== X-Received: by 2002:adf:e5c4:: with SMTP id a4mr10992771wrn.174.1615504346467; Thu, 11 Mar 2021 15:12:26 -0800 (PST) Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id s23sm255991wmc.35.2021.03.11.15.12.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 15:12:26 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Claudio Fontana Subject: [PATCH 4/6] qtest/arm-cpu-features: Check KVM availability at runtime Date: Fri, 12 Mar 2021 00:12:00 +0100 Message-Id: <20210311231202.1536040-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210311231202.1536040-1-philmd@redhat.com> References: <20210311231202.1536040-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: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Andrew Jones , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Thomas Huth , Markus Armbruster , qemu-arm@nongnu.org, Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" sve_tests_sve_off_kvm() and test_query_cpu_model_expansion_kvm() are KVM specific tests. Skip them if KVM is not built-in. Signed-off-by: Philippe Mathieu-Daudé --- tests/qtest/arm-cpu-features.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c index 8252b85bb85..2b70104515d 100644 --- a/tests/qtest/arm-cpu-features.c +++ b/tests/qtest/arm-cpu-features.c @@ -21,7 +21,7 @@ #define SVE_MAX_VQ 16 #define MACHINE "-machine virt,gic-version=max -accel tcg " -#define MACHINE_KVM "-machine virt,gic-version=max -accel kvm -accel tcg " +#define MACHINE_KVM "-machine virt,gic-version=max -accel kvm " #define QUERY_HEAD "{ 'execute': 'query-cpu-model-expansion', " \ " 'arguments': { 'type': 'full', " #define QUERY_TAIL "}}" @@ -413,6 +413,10 @@ static void sve_tests_sve_off_kvm(const void *data) QTestState *qts; qts = qtest_init(MACHINE_KVM "-cpu max,sve=off"); + if (!qtest_probe_accel(qts, "kvm")) { + g_test_skip("KVM not available, skipping test"); + goto done; + } /* * We don't know if this host supports SVE so we don't @@ -424,6 +428,7 @@ static void sve_tests_sve_off_kvm(const void *data) assert_sve_vls(qts, "max", 0, NULL); assert_sve_vls(qts, "max", 0, "{ 'sve128': false }"); +done: qtest_quit(qts); } @@ -492,6 +497,10 @@ static void test_query_cpu_model_expansion_kvm(const void *data) QTestState *qts; qts = qtest_init(MACHINE_KVM "-cpu max"); + if (!qtest_probe_accel(qts, "kvm")) { + g_test_skip("KVM not available, skipping test"); + goto done; + } /* * These tests target the 'host' CPU type, so KVM must be enabled. @@ -609,6 +618,7 @@ static void test_query_cpu_model_expansion_kvm(const void *data) assert_has_not_feature(qts, "host", "kvm-steal-time"); } +done: qtest_quit(qts); } -- 2.26.2