From nobody Sat May 4 04:40:56 2024 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1658239006; cv=none; d=zohomail.com; s=zohoarc; b=UfZaGxbpP+4+4+/lNHGDcoXSPNEhV5ZQHYKj69kHT0jgt38Awiq3+PHbdek5hJDgJtyS0+4R3TJSCA6JA2HcR5nutzf2U+rBAcRQ/cz7uKvIjIrtBdCDooIk3Xe2X8DW/JJ03MLET2mbZGJKCImv9RW+IBDZEmFMdc7B9Pu2sj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658239006; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=jC4iPmmF5INsX7V/YDDUnl66lfLFdohDDzzqdflMqfw=; b=NKGLTjp5sK0+uZk2tzSkb3730A561emPkPDPkify5Xh+XMn7H9BPXucoTfjHQBoPuQ67hlNoxria6mJRHtWI3kp+DRn8ko6Hd875Va7hHm+Li1lCY6YfhcPPNzOj712Ch0hc2/4KaO8n0elNymtUrYRwJyL8EPE5cWB6toLknmw= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1658239006609966.2223493009959; Tue, 19 Jul 2022 06:56:46 -0700 (PDT) Received: from localhost ([::1]:42126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDniO-0006GV-Hq for importer@patchew.org; Tue, 19 Jul 2022 09:56:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDlt7-0004dT-6t for qemu-devel@nongnu.org; Tue, 19 Jul 2022 07:59:41 -0400 Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]:44765) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oDlt4-00083t-Uk for qemu-devel@nongnu.org; Tue, 19 Jul 2022 07:59:40 -0400 Received: by mail-lj1-x229.google.com with SMTP id x10so16633542ljj.11 for ; Tue, 19 Jul 2022 04:59:38 -0700 (PDT) Received: from drapas-VirtualBox.office.auriga.msk ([77.222.111.229]) by smtp.gmail.com with ESMTPSA id i8-20020a2ea228000000b0025d4599d738sm2648411ljm.54.2022.07.19.04.59.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 04:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jC4iPmmF5INsX7V/YDDUnl66lfLFdohDDzzqdflMqfw=; b=f7zDh4gzFS90SDFuA+xQNs6JhxmJzPJ/DV2mLA8bm6W13wJfbI0+SzcU9jIkFTfY6c YY7StWoOsQTdwNd5b4791VjQSYUxihR3eVLNq0/gD4EG1+v9IHGV6y4WhfvIWcGj+GhW LQECVKk37dDNRaYIfEyVO3Rc7mOQufXa0Nw9uJk8+1/Xlv0Pf7SpBIltW1zDFA2OEA4s A1lg0KaKH+9Niy0hmx7HVQBGp4zA17/A6057ifN3GSxoI5GTxwP2k0gH7d4UKCfP3Lp0 3blG9GlvNf8AsJ4ECxLhdylzV8V7PC2vLZ9ctQ7QQ7KQcsDQEpEx0WCPt7jK7KfzoO38 SfjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jC4iPmmF5INsX7V/YDDUnl66lfLFdohDDzzqdflMqfw=; b=zzMuds120Rl9BdUdrp8vOTXKESinf0OK+sTxBg1fb7WxtgReIcBNpnFjGqFer891RE T0xnT5AFlGVQLr/ujndZ7uoH6fWvQ3dt5XU+RARkygHNHlbnkRAPmwpzfs/YQ0Gwzahh fXm6GFFWfwD6C1wYkyLFszbIe6c7EI2yRjbPagE7N1nFLZ8Gqzpzy54EUhCGRudLcsry YHZaATVWONnteSq7uI2ZSJlLU1RAwdPHtLcL6+mIYFdIV5lAFlOuSDlGMjQVKsyZbXVT EDUiT6KS2wfiG2TfbEF9ny9c9gk+yxtDQt5clhw+DzK/0OKX8Oy4WjxiMZibaXzUKe3a neVQ== X-Gm-Message-State: AJIora9Sa+BCpgxHJ8yGWWeG70i02ddVvr10et5/3Ktb5Pvqjx8Jpvpg SE9g8g+REy3xtg2BPfquCpONiVOAz+MTWg== X-Google-Smtp-Source: AGRyM1uRPAxKquHME4NS4KnMCcLIcwoD58Go35c6o8pFiTnv5q3n0tKg8BywU6d2FWWvrNk7W3lXAg== X-Received: by 2002:a05:651c:1501:b0:25d:a415:8ffd with SMTP id e1-20020a05651c150100b0025da4158ffdmr9480317ljf.310.1658231976483; Tue, 19 Jul 2022 04:59:36 -0700 (PDT) From: Drap Anton X-Google-Original-From: Drap Anton To: qemu-devel@nongnu.org Cc: anton.drap@auriga.com Subject: [PATCH v2] Loading new machines and devices from external modules Date: Tue, 19 Jul 2022 16:59:22 +0500 Message-Id: <20220719115922.306265-1-anton.drap@auriga.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::229; envelope-from=drapas86@gmail.com; helo=mail-lj1-x229.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 19 Jul 2022 09:21:29 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1658239008057100001 Content-Type: text/plain; charset="utf-8" From: "Drap, Anton" There is no mechanism to load external machines and classes from modules at the moment. This patch is to add two parameters `add_machine` and `add_modinfo` for it. `add_machine` is to add machines from external modules. `add_modinfo` is to add devices from external modules, needed for a new machine, for example. Main aim is to have possibility to develop independent models and be able to use it with mainline QEMU. It will help to make develop new models of proprietary boards, simplify to use Qemu by hardware developers and extend number of supporting boards and devices in QEMU. It will be easier for small hardware manufacturers to use QEMU to develop their own board models and use them to shift left of FW/SW development. Signed-off-by: Drap Anton --- v2: - subject is fixed --- include/qapi/qmp/qjson.h | 2 + include/qemu/module.h | 4 +- qemu-options.hx | 38 ++++++ qobject/qjson.c | 14 ++ scripts/modinfo-generate.py | 7 +- softmmu/vl.c | 14 ++ util/module.c | 249 +++++++++++++++++++++++++++++++++++- 7 files changed, 320 insertions(+), 8 deletions(-) diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qjson.h index 7bd8d2de1b..bd1a44ce90 100644 --- a/include/qapi/qmp/qjson.h +++ b/include/qapi/qmp/qjson.h @@ -25,6 +25,8 @@ QDict *qdict_from_vjsonf_nofail(const char *string, va_li= st ap) QDict *qdict_from_jsonf_nofail(const char *string, ...) G_GNUC_PRINTF(1, 2); =20 +QDict *qdict_from_json_nofail_nofmt(const char *string); + GString *qobject_to_json(const QObject *obj); GString *qobject_to_json_pretty(const QObject *obj, bool pretty); =20 diff --git a/include/qemu/module.h b/include/qemu/module.h index bd73607104..cdd3a3ceef 100644 --- a/include/qemu/module.h +++ b/include/qemu/module.h @@ -73,6 +73,8 @@ bool module_load_one(const char *prefix, const char *lib_= name, bool mayfail); void module_load_qom_one(const char *type); void module_load_qom_all(void); void module_allow_arch(const char *arch); +bool load_external_modules(const char *mods_list); +bool add_modinfo(const char *filename); =20 /** * DOC: module info annotation macros @@ -154,7 +156,7 @@ void module_allow_arch(const char *arch); typedef struct QemuModinfo QemuModinfo; struct QemuModinfo { const char *name; - const char *arch; + const char **arch; const char **objs; const char **deps; const char **opts; diff --git a/qemu-options.hx b/qemu-options.hx index 377d22fbd8..804d15e0f0 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -5476,6 +5476,44 @@ SRST (qemu) qom-set /objects/iothread1 poll-max-ns 100000 ERST =20 +DEF("add_machines", HAS_ARG, QEMU_OPTION_add_machines, \ + "-add_machines libname[,...]\n", + QEMU_ARCH_ALL) +SRST +``-add_machines libname[,...]`` + Add machines from external modules. + For example: + + :: + + -add_machines custom-arm-machine,custom-arm-machine2 +ERST + +DEF("add_modinfo", HAS_ARG, QEMU_OPTION_add_modinfo, \ + "-add_modinfo filename\n", + QEMU_ARCH_ALL) +SRST +``-add_modinfo filename`` + Extend modinfo from file. Used to add devices from external modules. + Modinfo extention file is a JSON file with dictionary of modules: + { + "short name of module": {"name": "module-name", + "arch": ["supported_arch_1", "supported_arch_= 2",], + "objs": ["object1_description", "object2_desc= ription",], + "deps": ["depend_of_module_name1", "depend_of= _module_name2",], + "opts": ["option1", "option2",] + } + } + + Architectures should be designated as they are printed by ./configure = --help in target list + without "-softmmu" or "-linux-user" suffixes. e.g.: "arm", "x86_64", "= riscv32", etc. + + For example: + + :: + + -add_modinfo modinfo_extention.json +ERST =20 HXCOMM This is the last statement. Insert new options before this line! =20 diff --git a/qobject/qjson.c b/qobject/qjson.c index 167fcb429c..6045264594 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -148,6 +148,20 @@ QDict *qdict_from_jsonf_nofail(const char *string, ...) return qdict; } =20 +/* + * Parse @string as JSON object without %-escapes interpolated. + * Abort on error. Do not use with untrusted @string. + * Return the resulting QDict. It is never null. + */ +QDict *qdict_from_json_nofail_nofmt(const char *string) +{ + QDict *qdict; + qdict =3D qobject_to(QDict, qobject_from_json(string, &error_abort)); + assert(qdict); + return qdict; +} + + static void to_json(JSONWriter *writer, const char *name, const QObject *obj) { diff --git a/scripts/modinfo-generate.py b/scripts/modinfo-generate.py index b1538fcced..ddfe444fea 100755 --- a/scripts/modinfo-generate.py +++ b/scripts/modinfo-generate.py @@ -33,7 +33,7 @@ def parse_line(line): return (kind, data) =20 def generate(name, lines, enabled): - arch =3D "" + arch =3D [] objs =3D [] deps =3D [] opts =3D [] @@ -47,7 +47,7 @@ def generate(name, lines, enabled): elif kind =3D=3D 'opts': opts.append(data) elif kind =3D=3D 'arch': - arch =3D data; + arch.append(data) elif kind =3D=3D 'kconfig': # don't add a module which dependency is not enabled # in kconfig @@ -61,8 +61,7 @@ def generate(name, lines, enabled): exit(1) =20 print(" .name =3D \"%s\"," % name) - if arch !=3D "": - print(" .arch =3D %s," % arch) + print_array("arch", arch) print_array("objs", objs) print_array("deps", deps) print_array("opts", opts) diff --git a/softmmu/vl.c b/softmmu/vl.c index aabd82e09a..17293eeda7 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3465,6 +3465,20 @@ void qemu_init(int argc, char **argv, char **envp) case QEMU_OPTION_enable_sync_profile: qsp_enable(); break; + case QEMU_OPTION_add_machines: + info_report("External machines loading: %s", optarg); + if (!load_external_modules(optarg)) { + error_report("Modules loading error. Modules %s", opta= rg); + exit(1); + } + break; + case QEMU_OPTION_add_modinfo: + info_report("Modinfo parsing: %s", optarg); + if (!add_modinfo(optarg)) { + error_report("Modinfo (%s) adding error", optarg); + exit(1); + } + break; case QEMU_OPTION_nouserconfig: /* Nothing to be parsed here. Especially, do not error out= below. */ break; diff --git a/util/module.c b/util/module.c index 8ddb0e18f5..c2eec5d1c3 100644 --- a/util/module.c +++ b/util/module.c @@ -21,6 +21,10 @@ #include "qemu/module.h" #include "qemu/cutils.h" #include "qemu/config-file.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qstring.h" #ifdef CONFIG_MODULE_UPGRADES #include "qemu-version.h" #endif @@ -124,6 +128,7 @@ void module_init_info(const QemuModinfo *info) module_info =3D info; } =20 + void module_allow_arch(const char *arch) { module_arch =3D arch; @@ -136,10 +141,20 @@ static bool module_check_arch(const QemuModinfo *modi= nfo) /* no arch set -> ignore all */ return false; } - if (strcmp(module_arch, modinfo->arch) !=3D 0) { - /* mismatch */ - return false; + + const char **arch_list =3D modinfo->arch; + const char *arch; + + while ((arch =3D *(arch_list++))) { + + if (strcmp(module_arch, arch) =3D=3D 0) { + return true; + } } + + /* modinfo->arch is not empty but no match found */ + /* current arch is not supported */ + return false; } return true; } @@ -314,6 +329,32 @@ bool module_load_one(const char *prefix, const char *l= ib_name, bool mayfail) =20 static bool module_loaded_qom_all; =20 +static void modinfo_prepend(QemuModinfo **modinfo, uint32_t mod_count, + const QemuModinfo *modinfo_ext) { + const QemuModinfo *pinfo; + uint32_t mod_count_new; + uint32_t mod_count_ext =3D 0; + uint32_t i; + + for (pinfo =3D modinfo_ext; pinfo->name !=3D NULL; ++pinfo) { + ++mod_count_ext; + } + + /* 1 for end of list */ + mod_count_new =3D mod_count + mod_count_ext + 1; + *modinfo =3D g_realloc(*modinfo, mod_count_new * sizeof(**modinfo)); + memmove((*modinfo) + mod_count_ext, + *modinfo, + mod_count * sizeof(**modinfo)); + /* last entry with null name treat as end of array */ + (*modinfo)[mod_count_new - 1].name =3D NULL; + + for (pinfo =3D modinfo_ext, i =3D 0; pinfo->name !=3D NULL; ++pinfo, += +i) { + (*modinfo)[i] =3D *pinfo; + } +} + + void module_load_qom_one(const char *type) { const QemuModinfo *modinfo; @@ -376,11 +417,213 @@ void qemu_load_module_for_opts(const char *group) } } =20 +bool load_external_modules(const char *mods_list) +{ + bool res =3D false; + g_auto(GStrv) mod_names =3D NULL; + + mod_names =3D g_strsplit(mods_list, ",", -1); + for (int i =3D 0; mod_names[i]; ++i) { + res =3D module_load_one("", mod_names[i], false); + if (!res) { + error_report("Module %s not found", mod_names[i]); + break; + } + info_report("Module %s loaded", mod_names[i]); + } + + return res; +} + +bool add_modinfo(const char *filename) +{ + g_autofree char *buf =3D NULL; + gsize buflen; + GError *gerr =3D NULL; + QDict *modinfo_dict; + QList *arch; + QList *objs; + QList *deps; + QList *opts; + const QDictEntry *entry; + uint32_t i =3D 0; + uint32_t mod_count =3D 0; + QemuModinfo *modinfo_ext; + + if (!g_file_get_contents(filename, &buf, &buflen, &gerr)) { + fprintf(stderr, "Cannot open modinfo extension file %s: %s\n", + filename, gerr->message); + g_error_free(gerr); + return false; + } + + modinfo_dict =3D qdict_from_json_nofail_nofmt(buf); + + if (!modinfo_dict) { + fprintf(stderr, "Invalid modinfo (%s) format: parsing json error\n= ", + filename); + g_error_free(gerr); + return false; + } + + for (entry =3D qdict_first(modinfo_dict); entry; + entry =3D qdict_next(modinfo_dict, entry)) { + mod_count++; + } + if (mod_count =3D=3D 0) { + return true; + } + + modinfo_ext =3D g_malloc0(sizeof(*modinfo_ext) * (mod_count + 1)); + /* last entry with null name treat as end of array */ + modinfo_ext[mod_count].name =3D NULL; + + for (entry =3D qdict_first(modinfo_dict), i =3D 0; entry; + entry =3D qdict_next(modinfo_dict, entry), ++i) { + + QListEntry *qlist_entry; + QDict *module_dict; + QemuModinfo *modinfo; + size_t list_size; + uint32_t n =3D 0; + + if (qobject_type(entry->value) !=3D QTYPE_QDICT) { + fprintf(stderr, "Invalid modinfo (%s) format: entry is" + " not dictionary\n", filename); + return false; + } + + module_dict =3D qobject_to(QDict, entry->value); + modinfo =3D &modinfo_ext[i]; + + modinfo->name =3D g_strdup(qdict_get_str(module_dict, "name")); + + arch =3D qdict_get_qlist(module_dict, "arch"); + if (arch) { + n =3D 0; + list_size =3D qlist_size(arch); + modinfo->arch =3D g_malloc((list_size + 1) * sizeof(*modinfo->= arch)); + modinfo->arch[list_size] =3D NULL; + QLIST_FOREACH_ENTRY(arch, qlist_entry) { + if (qobject_type(qlist_entry->value) !=3D QTYPE_QSTRING) { + fprintf(stderr, "Invalid modinfo (%s) format: arch\n\n= ", + filename); + return false; + } + QString *qstr =3D qobject_to(QString, qlist_entry->value); + modinfo->arch[n++] =3D g_strdup(qstring_get_str(qstr)); + } + } else { + modinfo->arch =3D NULL; + } + + objs =3D qdict_get_qlist(module_dict, "objs"); + if (objs) { + n =3D 0; + list_size =3D qlist_size(objs); + modinfo->objs =3D g_malloc((list_size + 1) * sizeof(*modinfo->= objs)); + modinfo->objs[list_size] =3D NULL; + QLIST_FOREACH_ENTRY(objs, qlist_entry) { + if (qobject_type(qlist_entry->value) !=3D QTYPE_QSTRING) { + fprintf(stderr, "Invalid modinfo (%s) format: objs\n\n= ", + filename); + return false; + } + QString *qstr =3D qobject_to(QString, qlist_entry->value); + modinfo->objs[n++] =3D g_strdup(qstring_get_str(qstr)); + } + } else { + modinfo->objs =3D NULL; + } + + deps =3D qdict_get_qlist(module_dict, "deps"); + if (deps) { + n =3D 0; + list_size =3D qlist_size(deps); + modinfo->deps =3D g_malloc((list_size + 1) * sizeof(*modinfo->= deps)); + modinfo->deps[list_size] =3D NULL; + QLIST_FOREACH_ENTRY(deps, qlist_entry) { + if (qobject_type(qlist_entry->value) !=3D QTYPE_QSTRING) { + fprintf(stderr, "Invalid modinfo (%s) format: deps", + filename); + return false; + } + QString *qstr =3D qobject_to(QString, qlist_entry->value); + modinfo->deps[n++] =3D g_strdup(qstring_get_str(qstr)); + } + } else { + modinfo->deps =3D NULL; + } + + opts =3D qdict_get_qlist(module_dict, "opts"); + if (opts) { + n =3D 0; + list_size =3D qlist_size(opts); + modinfo->opts =3D g_malloc((list_size + 1) * sizeof(*modinfo->= opts)); + modinfo->opts[list_size] =3D NULL; + QLIST_FOREACH_ENTRY(opts, qlist_entry) { + if (qobject_type(qlist_entry->value) !=3D QTYPE_QSTRING) { + fprintf(stderr, "Invalid modinfo (%s) format: opts\n", + filename); + return false; + } + QString *qstr =3D qobject_to(QString, qlist_entry->value); + modinfo->opts[n++] =3D g_strdup(qstring_get_str(qstr)); + } + } else { + modinfo->opts =3D NULL; + } + } + + qobject_unref(modinfo_dict); + + modinfo_prepend(&modinfo_ext, mod_count, module_info); + module_init_info(modinfo_ext); + return true; +} + +void modinfo_prepend(QemuModinfo **modinfo, uint32_t mod_count, + const QemuModinfo *modinfo_ext) +{ + const QemuModinfo *pinfo; + uint32_t mod_count_new; + uint32_t mod_count_ext =3D 0; + uint32_t i; + + for (pinfo =3D modinfo_ext; pinfo->name !=3D NULL; ++pinfo) { + ++mod_count_ext; + } + + /* 1 for end of list */ + mod_count_new =3D mod_count + mod_count_ext + 1; + *modinfo =3D g_realloc(*modinfo, mod_count_new * sizeof(**modinfo)); + memmove((*modinfo) + mod_count_ext, + *modinfo, + mod_count * sizeof(**modinfo)); + /* last entry with null name treat as end of array */ + (*modinfo)[mod_count_new - 1].name =3D NULL; + + for (pinfo =3D modinfo_ext, i =3D 0; pinfo->name !=3D NULL; ++pinfo, += +i) { + (*modinfo)[i] =3D *pinfo; + } +} + + #else =20 void module_allow_arch(const char *arch) {} void qemu_load_module_for_opts(const char *group) {} void module_load_qom_one(const char *type) {} void module_load_qom_all(void) {} +bool load_external_modules(const char *mods_list) +{ + fprintf(stderr, "Modules are not enabled\n"); + return false; +} +bool add_modinfo(const char *filename) +{ + fprintf(stderr, "Modules are not enabled\n"); + return false; +} =20 #endif --=20 2.34.1