From nobody Sun Feb 8 21:47:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602587209; cv=none; d=zohomail.com; s=zohoarc; b=J1TX4118gLeJXwDZ+ir37osATw4qx7YcWzO6v7fSLVx8LwvM9oMPR0mwZQ9a73FySckiWy11qF2IeaxD81NKl/G9obDBZOB7uby9MG3IcrcglgaDqjjez4zdafNaHIPHtHOxKYWB3KEWMABJ8JZbjk2d0I6Yuf8UFOlGfcNf+yE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602587209; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ZVTw23lH6UgX7hwjWL1WRAG4e767IZDw2HbVcVmiCXU=; b=KJrg2eQ6KL4sOVAjdRkmv+t3n0/DSWKEEGpzzHdMnKqnfruEMVB2evIW6r+u0zzAgF4PcbX4p3yionIHp9LvbZtPg7YW8nki+xaEqcv2t5mxbp+CZ/B0jvYPiOSzOwy4yx8r+guFeJA1he54+MnseaNA+3aQ/3WI5zrxjGPGrs8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602587209386792.8173637523328; Tue, 13 Oct 2020 04:06:49 -0700 (PDT) Received: from localhost ([::1]:38330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSI8m-0000U1-LV for importer@patchew.org; Tue, 13 Oct 2020 07:06:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSHyM-0005VW-3l for qemu-devel@nongnu.org; Tue, 13 Oct 2020 06:56:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30593) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kSHyH-0006Di-65 for qemu-devel@nongnu.org; Tue, 13 Oct 2020 06:56:01 -0400 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-169-Xk668mutOGCry6RL1BFPIg-1; Tue, 13 Oct 2020 06:55:54 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A000C86ABCE; Tue, 13 Oct 2020 10:55:53 +0000 (UTC) Received: from thuth.com (ovpn-112-151.ams2.redhat.com [10.36.112.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BDC76EF41; Tue, 13 Oct 2020 10:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602586556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=ZVTw23lH6UgX7hwjWL1WRAG4e767IZDw2HbVcVmiCXU=; b=VI0KECShro1awm+q8WHSJ4TmvWuzXs1FxESzXxmIC7WsTwrrEeN6GlN7r7+FUZdmQUcDRF qL49xVfAgWY4wPYU0TfmXwulfQWGvpeK90njvLht0srek6VGtqYMWndHseGulMIhxjF5bo 7MGsm34ZvbIwaBizuY62EkWuvtJwjA8= X-MC-Unique: Xk668mutOGCry6RL1BFPIg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 08/23] softmmu/vl: Be less verbose about missing KVM when running the qtests Date: Tue, 13 Oct 2020 12:55:12 +0200 Message-Id: <20201013105527.20088-9-thuth@redhat.com> In-Reply-To: <20201013105527.20088-1-thuth@redhat.com> References: <20201013105527.20088-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/13 02:06:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some of the qtests use "-accel kvm -accel tcg" to run real guest code. This causes some error messages when kvm is not available. We do not really care about these messages since the fallback to tcg is expected here. So let's silence them to avoid that they spoil the output of the tests. Unfortunately, we can not use the qtest_enabled() wrapper in this case, since the qtest accelerator itself is not initialized. Thus we have to test for the qtest_chrdev variable instead. Message-Id: <20200710085020.28222-1-thuth@redhat.com> Reviewed-by: Alexander Bulekov Signed-off-by: Thomas Huth --- softmmu/vl.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index 5a11a62f78..254ee5e525 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -165,8 +165,9 @@ bool boot_strict; uint8_t *boot_splash_filedata; int only_migratable; /* turn it off unless user states otherwise */ bool wakeup_suspend_enabled; - int icount_align_option; +static const char *qtest_chrdev; +static const char *qtest_log; =20 /* The bytes in qemu_uuid are in the order specified by RFC4122, _not_ in = the * little-endian "wire format" described in the SMBIOS 2.6 specification. @@ -2713,10 +2714,15 @@ static int do_configure_accelerator(void *opaque, Q= emuOpts *opts, Error **errp) AccelClass *ac =3D accel_find(acc); AccelState *accel; int ret; + bool qtest_with_kvm; + + qtest_with_kvm =3D g_str_equal(acc, "kvm") && qtest_chrdev !=3D NULL; =20 if (!ac) { *p_init_failed =3D true; - error_report("invalid accelerator %s", acc); + if (!qtest_with_kvm) { + error_report("invalid accelerator %s", acc); + } return 0; } accel =3D ACCEL(object_new_with_class(OBJECT_CLASS(ac))); @@ -2728,8 +2734,9 @@ static int do_configure_accelerator(void *opaque, Qem= uOpts *opts, Error **errp) ret =3D accel_init_machine(accel, current_machine); if (ret < 0) { *p_init_failed =3D true; - error_report("failed to initialize %s: %s", - acc, strerror(-ret)); + if (!qtest_with_kvm || ret !=3D -ENOENT) { + error_report("failed to initialize %s: %s", acc, strerror(-ret= )); + } return 0; } =20 @@ -2800,7 +2807,7 @@ static void configure_accelerators(const char *progna= me) exit(1); } =20 - if (init_failed) { + if (init_failed && !qtest_chrdev) { AccelClass *ac =3D ACCEL_GET_CLASS(current_accel()); error_report("falling back to %s", ac->name); } @@ -2870,8 +2877,6 @@ void qemu_init(int argc, char **argv, char **envp) MachineClass *machine_class; const char *cpu_option; const char *vga_model =3D NULL; - const char *qtest_chrdev =3D NULL; - const char *qtest_log =3D NULL; const char *incoming =3D NULL; bool userconfig =3D true; bool nographic =3D false; --=20 2.18.2