From patchwork Wed Jun 16 15:24:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 12325505 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=-13.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 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 5B8FEC48BE6 for ; Wed, 16 Jun 2021 15:26:24 +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 2297D6128B for ; Wed, 16 Jun 2021 15:26:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2297D6128B 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]:50034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ltXQt-0003JT-8U for qemu-devel@archiver.kernel.org; Wed, 16 Jun 2021 11:26:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltXPm-0001ml-1n for qemu-devel@nongnu.org; Wed, 16 Jun 2021 11:25:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:25532) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ltXPi-0007Ju-1W for qemu-devel@nongnu.org; Wed, 16 Jun 2021 11:25:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623857108; 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=LhH5B52MVwOCmHtejO2KtUH2ci4nMxZ0QVw7G0xgmHk=; b=ZsvFbJH17a20th1KuLnn/dCVzhLYpPXQjx0nNfK5/EHRLF9e1iz2KljuXON9gHG/SCB7U6 r2dMU8OLSVUhbEVZl+qT6C9WM6z1sayMRBcTizkgQgg3XtDsrUy2QTuSXbwc0i1EZVLNz1 +syHng/mc80rcToSxN43OS3elhxtFpE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-368-H8w5VH2COQ6vbUchR6PfDA-1; Wed, 16 Jun 2021 11:25:07 -0400 X-MC-Unique: H8w5VH2COQ6vbUchR6PfDA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E7ECD81840E for ; Wed, 16 Jun 2021 15:25:06 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id C76655C1D0; Wed, 16 Jun 2021 15:25:05 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [RFC 1/3] tests: qtest: add qtest_has_kvm() to check if tested binary supports KVM Date: Wed, 16 Jun 2021 11:24:53 -0400 Message-Id: <20210616152455.1270264-2-imammedo@redhat.com> In-Reply-To: <20210616152455.1270264-1-imammedo@redhat.com> References: <20210616152455.1270264-1-imammedo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=imammedo@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.199, 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=ham 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: lvivier@redhat.com, thuth@redhat.com, philmd@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: root Currently it 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_kvm() to let users check if KVM is available in advance and skip registering non run-able test-cases. Signed-off-by: root --- PS: It's simplistic and not as versatile/precise as earlier proposed 'query-accels' series, but it get job done for simple cases. on upside it's much cheaper to execute than the 'query-accels' as it doesn't need to run QEMU for probing. tests/qtest/libqos/libqtest.h | 7 +++++++ meson.build | 1 + tests/qtest/libqtest.c | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/tests/qtest/libqos/libqtest.h b/tests/qtest/libqos/libqtest.h index a68dcd79d4..bab0047117 100644 --- a/tests/qtest/libqos/libqtest.h +++ b/tests/qtest/libqos/libqtest.h @@ -588,6 +588,13 @@ bool qtest_big_endian(QTestState *s); */ const char *qtest_get_arch(void); +/** + * qtest_has_kvm: + * + * Returns: True if the QEMU executable under test supports KVM + */ +bool qtest_has_kvm(void); + /** * qtest_add_func: * @str: Test case path. diff --git a/meson.build b/meson.build index d2a9ce91f5..dbd31f9f6c 100644 --- a/meson.build +++ b/meson.build @@ -75,6 +75,7 @@ elif cpu in ['mips', 'mips64'] else kvm_targets = [] endif +config_host_data.set_quoted('CONFIG_KVM_TARGETS', ' ,'.join(kvm_targets)) accelerator_targets = { 'CONFIG_KVM': kvm_targets } if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index 825b13a44c..d019ac88c9 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -920,6 +920,26 @@ const char *qtest_get_arch(void) return end + 1; } +bool qtest_has_kvm(void) +{ + int i; + bool ret = false; + const char *arch = qtest_get_arch(); + const char *kvm_targets_str = CONFIG_KVM_TARGETS; + gchar **targets = g_strsplit(kvm_targets_str, " ", -1); + + for (i = 0; targets[i]; i++) { + if (!strncmp(targets[i], arch, strlen(arch))) { + if (access("/dev/kvm", R_OK | W_OK)) { + ret = true; + break; + } + } + } + g_strfreev(targets); + return ret; +} + bool qtest_get_irq(QTestState *s, int num) { /* dummy operation in order to make sure irq is up to date */