From patchwork Wed Jun 30 23:27:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jose R. Ziviani" X-Patchwork-Id: 12352953 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,URIBL_BLOCKED,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 A08F4C11F66 for ; Wed, 30 Jun 2021 23:34:01 +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 5F583613F3 for ; Wed, 30 Jun 2021 23:34:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F583613F3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyjiS-0002Tj-FK for qemu-devel@archiver.kernel.org; Wed, 30 Jun 2021 19:34:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyjch-0003Rc-3U for qemu-devel@nongnu.org; Wed, 30 Jun 2021 19:28:03 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]:45208) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyjcf-0001HB-C5 for qemu-devel@nongnu.org; Wed, 30 Jun 2021 19:28:02 -0400 Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D126822772; Wed, 30 Jun 2021 23:27:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1625095679; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9A+AtnUL9DzZOYMf3oNED1kNPLHxWYTOKQR7UgxLlSk=; b=YS1q5v65HJ6uXtV1iBv75UIrcjO66YPjxty45S5wuwZYae/qIuX6G/CBofIdu+67EgTcpZ ej2dwrcPBdryF6PpT/Kr5S7D+fez8VPpZz4xokcqnAxxJNher7q1/bhQdWTfuTXIxtDAbR wNTGIGCFot2N3uwzwM4geYtsae+2XfU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1625095679; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9A+AtnUL9DzZOYMf3oNED1kNPLHxWYTOKQR7UgxLlSk=; b=mAwzjpICG64BNbXWgRECz9XiZ9pPNVRq86sOjuzlmzCFuPfwp/OzQLk4u2/LRfJunWnyyb p0xSCociMWU8bXBA== Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id 86737118DD; Wed, 30 Jun 2021 23:27:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1625095679; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9A+AtnUL9DzZOYMf3oNED1kNPLHxWYTOKQR7UgxLlSk=; b=YS1q5v65HJ6uXtV1iBv75UIrcjO66YPjxty45S5wuwZYae/qIuX6G/CBofIdu+67EgTcpZ ej2dwrcPBdryF6PpT/Kr5S7D+fez8VPpZz4xokcqnAxxJNher7q1/bhQdWTfuTXIxtDAbR wNTGIGCFot2N3uwzwM4geYtsae+2XfU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1625095679; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9A+AtnUL9DzZOYMf3oNED1kNPLHxWYTOKQR7UgxLlSk=; b=mAwzjpICG64BNbXWgRECz9XiZ9pPNVRq86sOjuzlmzCFuPfwp/OzQLk4u2/LRfJunWnyyb p0xSCociMWU8bXBA== Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id wIcKEv393GA/IQAALh3uQQ (envelope-from ); Wed, 30 Jun 2021 23:27:57 +0000 From: "Jose R. Ziviani" To: qemu-devel@nongnu.org Subject: [RFC 1/3] modules: Add CONFIG_TCG_MODULAR in config_host Date: Wed, 30 Jun 2021 20:27:47 -0300 Message-Id: <20210630232749.21873-2-jziviani@suse.de> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210630232749.21873-1-jziviani@suse.de> References: <20210630232749.21873-1-jziviani@suse.de> MIME-Version: 1.0 Received-SPF: pass client-ip=195.135.220.28; envelope-from=jziviani@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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: berrange@redhat.com, ehabkost@redhat.com, "Jose R. Ziviani" , kraxel@redhat.com, pbonzini@redhat.com, cfontana@suse.de Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" CONFIG_TCG_MODULAR is a complement to CONFIG_MODULES, in order to know if TCG will be a module, even if --enable-modules option was set. Signed-off-by: Jose R. Ziviani --- meson.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meson.build b/meson.build index 2d72b8cc06..c37a2358d4 100644 --- a/meson.build +++ b/meson.build @@ -277,6 +277,9 @@ if not get_option('tcg').disabled() accelerators += 'CONFIG_TCG' config_host += { 'CONFIG_TCG': 'y' } + if is_tcg_modular + config_host += { 'CONFIG_TCG_MODULAR': 'y' } + endif endif if 'CONFIG_KVM' not in accelerators and get_option('kvm').enabled() From patchwork Wed Jun 30 23:27:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jose R. Ziviani" X-Patchwork-Id: 12352943 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,URIBL_BLOCKED,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 52C82C11F66 for ; Wed, 30 Jun 2021 23:29:44 +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 9F7476128E for ; Wed, 30 Jun 2021 23:29:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F7476128E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyjeI-0005wg-NV for qemu-devel@archiver.kernel.org; Wed, 30 Jun 2021 19:29:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyjcj-0003VT-Fw for qemu-devel@nongnu.org; Wed, 30 Jun 2021 19:28:05 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]:45216) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyjch-0001Io-QI for qemu-devel@nongnu.org; Wed, 30 Jun 2021 19:28:05 -0400 Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id A1E612279A; Wed, 30 Jun 2021 23:28:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1625095682; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zJfVoDi1pO/XbYFWOW3cRPVtpKatrx3osqgLwEZBdH8=; b=uX+UoSqOjzokht8Dmska0/EK8i9GXZz23zxK8QPnhNyv2dALNqc/rHb6h5slch+4ngZoTv PqJ757qoUo0lB5UBRh8Y0uXNrCZAGMaVA3FdHHJp/U97mjkgyoekmgrVoyu8nhwc07hIQZ BHtfeLE/jdEZnoQPIavtUQD6JySc3KY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1625095682; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zJfVoDi1pO/XbYFWOW3cRPVtpKatrx3osqgLwEZBdH8=; b=GScGqumomDM4fcPAUJAvCDz0nkqw0PyylMIEKJoaVIwfNBvGxMbSL7aM+gA3P7we7WTEcy ZgctDbQNkBHwReDA== Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id 543AE118DD; Wed, 30 Jun 2021 23:28:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1625095682; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zJfVoDi1pO/XbYFWOW3cRPVtpKatrx3osqgLwEZBdH8=; b=uX+UoSqOjzokht8Dmska0/EK8i9GXZz23zxK8QPnhNyv2dALNqc/rHb6h5slch+4ngZoTv PqJ757qoUo0lB5UBRh8Y0uXNrCZAGMaVA3FdHHJp/U97mjkgyoekmgrVoyu8nhwc07hIQZ BHtfeLE/jdEZnoQPIavtUQD6JySc3KY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1625095682; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zJfVoDi1pO/XbYFWOW3cRPVtpKatrx3osqgLwEZBdH8=; b=GScGqumomDM4fcPAUJAvCDz0nkqw0PyylMIEKJoaVIwfNBvGxMbSL7aM+gA3P7we7WTEcy ZgctDbQNkBHwReDA== Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id mDC0BQD+3GA/IQAALh3uQQ (envelope-from ); Wed, 30 Jun 2021 23:28:00 +0000 From: "Jose R. Ziviani" To: qemu-devel@nongnu.org Subject: [RFC 2/3] modules: Implement module_is_loaded function Date: Wed, 30 Jun 2021 20:27:48 -0300 Message-Id: <20210630232749.21873-3-jziviani@suse.de> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210630232749.21873-1-jziviani@suse.de> References: <20210630232749.21873-1-jziviani@suse.de> MIME-Version: 1.0 Received-SPF: pass client-ip=195.135.220.28; envelope-from=jziviani@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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: berrange@redhat.com, ehabkost@redhat.com, "Jose R. Ziviani" , kraxel@redhat.com, pbonzini@redhat.com, cfontana@suse.de Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The function module_load_one() fills a hash table will all modules that were successfuly loaded. However, that table is a static variable of module_load_one(). This patch changes it and creates a function that informs whether a given module was loaded or not. Signed-off-by: Jose R. Ziviani --- include/qemu/module.h | 3 +++ util/module.c | 28 +++++++++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/include/qemu/module.h b/include/qemu/module.h index 456e190a55..01779cc7fb 100644 --- a/include/qemu/module.h +++ b/include/qemu/module.h @@ -14,6 +14,7 @@ #ifndef QEMU_MODULE_H #define QEMU_MODULE_H +#include #define DSO_STAMP_FUN glue(qemu_stamp, CONFIG_STAMP) #define DSO_STAMP_FUN_STR stringify(DSO_STAMP_FUN) @@ -74,6 +75,8 @@ void module_load_qom_one(const char *type); void module_load_qom_all(void); void module_allow_arch(const char *arch); +bool module_is_loaded(const char *name); + /** * DOC: module info annotation macros * diff --git a/util/module.c b/util/module.c index 6bb4ad915a..64307b7a25 100644 --- a/util/module.c +++ b/util/module.c @@ -119,6 +119,8 @@ static const QemuModinfo module_info_stub[] = { { static const QemuModinfo *module_info = module_info_stub; static const char *module_arch; +static GHashTable *loaded_modules; + void module_init_info(const QemuModinfo *info) { module_info = info; @@ -206,13 +208,10 @@ static int module_load_file(const char *fname, bool mayfail, bool export_symbols out: return ret; } -#endif bool module_load_one(const char *prefix, const char *lib_name, bool mayfail) { bool success = false; - -#ifdef CONFIG_MODULES char *fname = NULL; #ifdef CONFIG_MODULE_UPGRADES char *version_dir; @@ -223,7 +222,6 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail) int i = 0, n_dirs = 0; int ret; bool export_symbols = false; - static GHashTable *loaded_modules; const QemuModinfo *modinfo; const char **sl; @@ -307,12 +305,9 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail) g_free(dirs[i]); } -#endif return success; } -#ifdef CONFIG_MODULES - static bool module_loaded_qom_all; void module_load_qom_one(const char *type) @@ -377,6 +372,15 @@ void qemu_load_module_for_opts(const char *group) } } +bool module_is_loaded(const char *name) +{ + if (!loaded_modules || !g_hash_table_contains(loaded_modules, name)) { + return false; + } + + return true; +} + #else void module_allow_arch(const char *arch) {} @@ -384,4 +388,14 @@ void qemu_load_module_for_opts(const char *group) {} void module_load_qom_one(const char *type) {} void module_load_qom_all(void) {} +bool module_load_one(const char *prefix, const char *lib_name, bool mayfail) +{ + return false; +} + +bool module_is_loaded(const char *name) +{ + return false; +} + #endif From patchwork Wed Jun 30 23:27:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jose R. Ziviani" X-Patchwork-Id: 12352945 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,URIBL_BLOCKED,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 1A5F8C11F66 for ; Wed, 30 Jun 2021 23:29:51 +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 57FE0613F8 for ; Wed, 30 Jun 2021 23:29:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57FE0613F8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyjeP-00065n-H7 for qemu-devel@archiver.kernel.org; Wed, 30 Jun 2021 19:29:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyjcm-0003bC-Aj for qemu-devel@nongnu.org; Wed, 30 Jun 2021 19:28:08 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]:45226) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyjck-0001KT-HA for qemu-devel@nongnu.org; Wed, 30 Jun 2021 19:28:08 -0400 Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 734CA22772; Wed, 30 Jun 2021 23:28:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1625095685; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KDqLDJYTh0P9kpqled2hZseGPTyb17fjHEmuFpYZiEw=; b=UzZy+7eaeCnM8azh3/wC3YhykMugaSFGyU99N6I/Q9509zlfupeuV2nrHkk76uETK7PDv+ TzjN4dBLWSUJn8bwIqpwzlKS0WrimZ/bxGwfIEocE2jKslrZfqCrRZyL506GFFW+As6XuS Nrv2qiAtiXD2DeYfDJWXbphhzT0CrTA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1625095685; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KDqLDJYTh0P9kpqled2hZseGPTyb17fjHEmuFpYZiEw=; b=02dtMQ4dD/VgTSLHot5MkwzKAWdFUOQbSuFWKsnzJh9YFxegGrRr2g4UTMcEtj6SLJEGQ1 30b0jPoL7m3MuCCQ== Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id 25A0A118DD; Wed, 30 Jun 2021 23:28:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1625095685; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KDqLDJYTh0P9kpqled2hZseGPTyb17fjHEmuFpYZiEw=; b=UzZy+7eaeCnM8azh3/wC3YhykMugaSFGyU99N6I/Q9509zlfupeuV2nrHkk76uETK7PDv+ TzjN4dBLWSUJn8bwIqpwzlKS0WrimZ/bxGwfIEocE2jKslrZfqCrRZyL506GFFW+As6XuS Nrv2qiAtiXD2DeYfDJWXbphhzT0CrTA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1625095685; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KDqLDJYTh0P9kpqled2hZseGPTyb17fjHEmuFpYZiEw=; b=02dtMQ4dD/VgTSLHot5MkwzKAWdFUOQbSuFWKsnzJh9YFxegGrRr2g4UTMcEtj6SLJEGQ1 30b0jPoL7m3MuCCQ== Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id CMO4NQL+3GA/IQAALh3uQQ (envelope-from ); Wed, 30 Jun 2021 23:28:02 +0000 From: "Jose R. Ziviani" To: qemu-devel@nongnu.org Subject: [RFC 3/3] qom: Improve error message in module_object_class_by_name() Date: Wed, 30 Jun 2021 20:27:49 -0300 Message-Id: <20210630232749.21873-4-jziviani@suse.de> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210630232749.21873-1-jziviani@suse.de> References: <20210630232749.21873-1-jziviani@suse.de> MIME-Version: 1.0 Received-SPF: pass client-ip=195.135.220.28; envelope-from=jziviani@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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: berrange@redhat.com, ehabkost@redhat.com, "Jose R. Ziviani" , kraxel@redhat.com, pbonzini@redhat.com, cfontana@suse.de Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" module_object_class_by_name() calls module_load_qom_one if the object is provided by a dynamically linked library. Such library might not be available at this moment - for instance, it can be a package not yet installed. Thus, instead of assert error messages, this patch outputs more friendly messages. Current error messages: $ ./qemu-system-x86_64 -machine q35 -accel tcg -kernel /boot/vmlinuz ... ERROR:../accel/accel-softmmu.c:82:accel_init_ops_interfaces: assertion failed: (ops != NULL) Bail out! ERROR:../accel/accel-softmmu.c:82:accel_init_ops_interfaces: assertion failed: (ops != NULL) [1] 31964 IOT instruction (core dumped) ./qemu-system-x86_64 ... New error message: $ ./qemu-system-x86_64 -machine q35 -accel tcg -kernel /boot/vmlinuz accel-tcg-x86_64 module is missing, install the package or config the library path correctly. $ make check ... Running test qtest-x86_64/test-filter-mirror Running test qtest-x86_64/endianness-test accel-qtest-x86_64 module is missing, install the package or config the library path correctly. accel-qtest-x86_64 module is missing, install the package or config the library path correctly. accel-qtest-x86_64 module is missing, install the package or config the library path correctly. accel-qtest-x86_64 module is missing, install the package or config the library path correctly. accel-qtest-x86_64 module is missing, install the package or config the library path correctly. accel-tcg-x86_64 module is missing, install the package or config the library path correctly. ... Signed-off-by: Jose R. Ziviani --- qom/object.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/qom/object.c b/qom/object.c index 6a01d56546..2d40245af9 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1024,6 +1024,24 @@ ObjectClass *object_class_by_name(const char *typename) return type->class; } +char *get_accel_module_name(const char *ac_name); + +char *get_accel_module_name(const char *ac_name) +{ + size_t len = strlen(ac_name); + char *module_name = NULL; + + if (strncmp(ac_name, "tcg-accel-ops", len) == 0) { +#ifdef CONFIG_TCG_MODULAR + module_name = g_strdup_printf("%s%s", "accel-tcg-", "x86_64"); +#endif + } else if (strncmp(ac_name, "qtest-accel-ops", len) == 0) { + module_name = g_strdup_printf("%s%s", "accel-qtest-", "x86_64"); + } + + return module_name; +} + ObjectClass *module_object_class_by_name(const char *typename) { ObjectClass *oc; @@ -1031,8 +1049,20 @@ ObjectClass *module_object_class_by_name(const char *typename) oc = object_class_by_name(typename); #ifdef CONFIG_MODULES if (!oc) { + char *module_name; module_load_qom_one(typename); oc = object_class_by_name(typename); + module_name = get_accel_module_name(typename); + if (module_name) { + if (!module_is_loaded(module_name)) { + fprintf(stderr, "%s module is missing, install the " + "package or config the library path " + "correctly.\n", module_name); + g_free(module_name); + exit(1); + } + g_free(module_name); + } } #endif return oc;