From nobody Sun Feb 8 21:28:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595239710; cv=none; d=zohomail.com; s=zohoarc; b=SF9v0+yEo1Pu37s7Mj7oJhLW/SZBOiQMjKL4ZRsi/xpjNsOnDiyGLU+HegwcbGUComGRootm1Bv2gLjgMWJF7pVOaX/IkqXHHUS0uh0eJuyzoMpGRbthH3gUzFVxQZLwpXx9zdjWDNf4gIgv6Fp+xX7Zmv8OUNoWY0O5Epd2MlE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595239710; 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=/2UxgP8mnbt9P0VhF2XX/RUSJK6zLk1dgu96asxWrBM=; b=NMEbaFrOe76yi0cLo8bLPH1TZsqcxqtnJwCzOdQ9cfSYtU5nj8qpw/qaqi4y2ihPliMxE3cOHtyU91D46iUh96R1UWTVHZjcRz6KwaL1byNLlntC5jAeRPdMz9pNQ83RSnhvr/xv072DokNr5ozKlwbTRDl4X69A9waqTBYVke0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1595239710697393.4998644013057; Mon, 20 Jul 2020 03:08:30 -0700 (PDT) Received: from localhost ([::1]:38436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxSih-0001iS-W2 for importer@patchew.org; Mon, 20 Jul 2020 06:08:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxSeR-0005Wk-2U for qemu-devel@nongnu.org; Mon, 20 Jul 2020 06:04:03 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:39963 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jxSeO-0007ub-Ju for qemu-devel@nongnu.org; Mon, 20 Jul 2020 06:04:02 -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-368-R5D8sv4wPUKH5xyj6IIM8Q-1; Mon, 20 Jul 2020 06:03:57 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 168EC108A for ; Mon, 20 Jul 2020 10:03:57 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-115-89.ams2.redhat.com [10.36.115.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCF566FEF6; Mon, 20 Jul 2020 10:03:53 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0CE819D05; Mon, 20 Jul 2020 12:03:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595239439; 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=/2UxgP8mnbt9P0VhF2XX/RUSJK6zLk1dgu96asxWrBM=; b=RksbKoPX0Much9nXANAb2OcHDgvI1FeVHKJ17+NWHwHG1GvkSUgD0jstDU9DCTrqY1fG/C +GylbSbSsXYesqlqbH9YPkiouDwOxsZw8YJKu2RBI8B812HjPtA7UC+A0tMdV4R9avnKyi 1sxORVhi6kfQ8/7tFqkDyoSpr3UvH9c= X-MC-Unique: R5D8sv4wPUKH5xyj6IIM8Q-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 3/3] module: silence errors for module_load_qom_all(). Date: Mon, 20 Jul 2020 12:03:52 +0200 Message-Id: <20200720100352.2477-4-kraxel@redhat.com> In-Reply-To: <20200720100352.2477-1-kraxel@redhat.com> References: <20200720100352.2477-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/20 02:16:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, 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: Laurent Vivier , Paolo Bonzini , Thomas Huth , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add mayfail bool parameter to module loading functions. Set it to true for module_load_qom_all() because device modules might not load into all system emulation variants. qemu-system-s390x for example will not load qxl because it lacks vga support. Makes "make check" less chatty. Signed-off-by: Gerd Hoffmann --- include/qemu/module.h | 8 ++++---- softmmu/qtest.c | 2 +- util/module.c | 17 ++++++++++------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/include/qemu/module.h b/include/qemu/module.h index 9121a475c1b6..944d403cbd15 100644 --- a/include/qemu/module.h +++ b/include/qemu/module.h @@ -61,15 +61,15 @@ typedef enum { #define fuzz_target_init(function) module_init(function, \ MODULE_INIT_FUZZ_TARGET) #define migration_init(function) module_init(function, MODULE_INIT_MIGRATI= ON) -#define block_module_load_one(lib) module_load_one("block-", lib) -#define ui_module_load_one(lib) module_load_one("ui-", lib) -#define audio_module_load_one(lib) module_load_one("audio-", lib) +#define block_module_load_one(lib) module_load_one("block-", lib, false) +#define ui_module_load_one(lib) module_load_one("ui-", lib, false) +#define audio_module_load_one(lib) module_load_one("audio-", lib, false) =20 void register_module_init(void (*fn)(void), module_init_type type); void register_dso_module_init(void (*fn)(void), module_init_type type); =20 void module_call_init(module_init_type type); -bool module_load_one(const char *prefix, const char *lib_name); +bool module_load_one(const char *prefix, const char *lib_name, bool mayfai= l); void module_load_qom_one(const char *type); void module_load_qom_all(void); =20 diff --git a/softmmu/qtest.c b/softmmu/qtest.c index 5672b75c354b..be81c9b9b83c 100644 --- a/softmmu/qtest.c +++ b/softmmu/qtest.c @@ -670,7 +670,7 @@ static void qtest_process_command(CharBackend *chr, gch= ar **words) g_assert(words[1] && words[2]); =20 qtest_send_prefix(chr); - if (module_load_one(words[1], words[2])) { + if (module_load_one(words[1], words[2], false)) { qtest_sendf(chr, "OK\n"); } else { qtest_sendf(chr, "FAIL\n"); diff --git a/util/module.c b/util/module.c index 0ab00851f0a4..3c5fbd0bc8c1 100644 --- a/util/module.c +++ b/util/module.c @@ -109,7 +109,7 @@ void module_call_init(module_init_type type) } =20 #ifdef CONFIG_MODULES -static int module_load_file(const char *fname) +static int module_load_file(const char *fname, bool mayfail) { GModule *g_module; void (*sym)(void); @@ -133,8 +133,10 @@ static int module_load_file(const char *fname) =20 g_module =3D g_module_open(fname, G_MODULE_BIND_LAZY | G_MODULE_BIND_L= OCAL); if (!g_module) { - fprintf(stderr, "Failed to open module: %s\n", - g_module_error()); + if (!mayfail) { + fprintf(stderr, "Failed to open module: %s\n", + g_module_error()); + } ret =3D -EINVAL; goto out; } @@ -166,7 +168,7 @@ out: } #endif =20 -bool module_load_one(const char *prefix, const char *lib_name) +bool module_load_one(const char *prefix, const char *lib_name, bool mayfai= l) { bool success =3D false; =20 @@ -223,7 +225,7 @@ bool module_load_one(const char *prefix, const char *li= b_name) for (i =3D 0; i < n_dirs; i++) { fname =3D g_strdup_printf("%s/%s%s", dirs[i], module_name, HOST_DSOSUF); - ret =3D module_load_file(fname); + ret =3D module_load_file(fname, mayfail); g_free(fname); fname =3D NULL; /* Try loading until loaded a module file */ @@ -284,7 +286,8 @@ void module_load_qom_one(const char *type) for (i =3D 0; i < ARRAY_SIZE(qom_modules); i++) { if (strcmp(qom_modules[i].type, type) =3D=3D 0) { module_load_one(qom_modules[i].prefix, - qom_modules[i].module); + qom_modules[i].module, + false); return; } } @@ -305,7 +308,7 @@ void module_load_qom_all(void) /* one module implementing multiple types -> load only once */ continue; } - module_load_one(qom_modules[i].prefix, qom_modules[i].module); + module_load_one(qom_modules[i].prefix, qom_modules[i].module, true= ); } module_loaded_qom_all =3D true; } --=20 2.18.4