From nobody Mon Feb 9 13:08:15 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=1621500329; cv=none; d=zohomail.com; s=zohoarc; b=SKgGd/22md9RPp+Z/Q8CYPU+Qp5ih/NFF/VZ4N7cJpVDjjlJL07Pkc16+/glCKGUYX9FI5ZTOKs6YLtdJnIf6wJkuT/MTcIn+ZI5eDTBQZ0rlwwuGM/D+6d1/Xtgdzu2TrNJnjN1bxJldYMMiEHiklihjUuxxTIZoZteO0OCltQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621500329; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TzYzur0aoGcQcPzxTRLpL0L9tdlIkO4njHPHcUkBeIQ=; b=LgTgFVaCcWQI5v/XEtl7EMeeWW3+z7S8wuLPv4smDH0YqYfcfTAZGlWjZzF7S1zlVFIwpxEMNH8blhHEkWzg0Ag8BCJzy8mGryzYikdYc7XpCjobgDtK1EMC0Od5nRO2PjuzQ8ZWxNExfZyVHDtjTKY1MDhVCFYDp2pV7HMikYY= 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 1621500329503383.69749792160314; Thu, 20 May 2021 01:45:29 -0700 (PDT) Received: from localhost ([::1]:40154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljeJ6-0007Tw-Db for importer@patchew.org; Thu, 20 May 2021 04:45:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljdxm-0005RW-PB; Thu, 20 May 2021 04:23:29 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:38625) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljdxf-0001aW-Ce; Thu, 20 May 2021 04:23:24 -0400 Received: by mail-wr1-x42c.google.com with SMTP id j14so14936013wrq.5; Thu, 20 May 2021 01:23:15 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id v10sm2603506wrq.0.2021.05.20.01.23.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 01:23:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TzYzur0aoGcQcPzxTRLpL0L9tdlIkO4njHPHcUkBeIQ=; b=TZuepqtSVyNOsHYJfSmxL8gSPUwQzx9YjmRu1386qnZjhudiWB7GhpEIH1qegAp7Mq CXWVWYgH5cTfeN2zckNHlbp0b2qB8XBQrZwjeRqHecsHt2UYyNvhxjR8ke3T+tqxN1HN 9Vo/YOv3smsMqG11qLzAcaG7F5gw4ONr2rGM3aRx0PXxdAb/AUosVt0tFgh3iJgEqun9 wskNA8c84wkPNLu3iBdLN/73dcrlOaZeXWSsrNMJFii4l5VL73njUfylWTDrB8cMqWkW 1Nqb6GHOpQUMqjCVXs8le+Z7DjMPoFDFWYVwLpVU2kb3jp5Uw9B7pLQIVmsxEqKlkv6s f8dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TzYzur0aoGcQcPzxTRLpL0L9tdlIkO4njHPHcUkBeIQ=; b=Hnu75gkjBWL5Pb55vBPIDO1IPz8bC+cyW6IHuHpl/umw44xbiJaUtXPj0JP1Lr+1CQ 28rXxA5FzPoZtCZFq/YJsYzPmx0cxL9HY1vudYopqY1MlaBMkzZlAfKWxe+mFuUL9+o0 LqM2JyKPRKMlKKtIjHlVoXq4T/EuxWl3WnMpEgA55sWXrYUiKtyUZdCZjKlFB1e28AbI Ey6aFVb8qJti0PvkqOE8VPMq6sZi8BCi+JkZ9tusNU8mAsIir7u91CG+o6f0RctQox0E ATpFCSDbVIKtZIa5qS54Dcmc5Rsbp5x4emrLDc/sUbLB0gdBDr1jzogT1YZnjjSK4TD9 VHxw== X-Gm-Message-State: AOAM530R7NdjZQYNRjM6EDBESyM1gaRyjnZzk0FIcDqTlSbjIXEALk1G /M1pEF19xZp0zVQ+1SHxG/Cmk1z2R+th0g== X-Google-Smtp-Source: ABdhPJymirXYMt9D3I3ovbxh51bUx2/IQrNQ4BY/+fhZyU39c2i010z/7AXFDPZeEJsHRfUJP56Lvw== X-Received: by 2002:a5d:4c49:: with SMTP id n9mr2877485wrt.417.1621498994869; Thu, 20 May 2021 01:23:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 25/26] qemu-config: load modules when instantiating option groups Date: Thu, 20 May 2021 10:22:56 +0200 Message-Id: <20210520082257.187061-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520082257.187061-1-pbonzini@redhat.com> References: <20210520082257.187061-1-pbonzini@redhat.com> 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::42c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Right now the SPICE module is special cased to be loaded when processing of the -spice command line option. However, the spice option group can also be brought in via -readconfig, in which case the module is not loaded. Add a generic hook to load modules that provide a QemuOpts group, and use it for the "spice" and "iscsi" groups. Fixes: #194 Fixes: https://bugs.launchpad.net/qemu/+bug/1910696 Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- include/qemu/config-file.h | 2 +- softmmu/vl.c | 21 +++++++++++++++++---- stubs/meson.build | 1 + stubs/module-opts.c | 6 ++++++ util/qemu-config.c | 1 + 5 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 stubs/module-opts.c diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index 8d3e53ae4d..0500b3668d 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -1,7 +1,7 @@ #ifndef QEMU_CONFIG_FILE_H #define QEMU_CONFIG_FILE_H =20 - +void qemu_load_module_for_opts(const char *group); QemuOptsList *qemu_find_opts(const char *group); QemuOptsList *qemu_find_opts_err(const char *group, Error **errp); QemuOpts *qemu_find_opts_singleton(const char *group); diff --git a/softmmu/vl.c b/softmmu/vl.c index 21e55718a6..6054f6f0b9 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2627,6 +2627,23 @@ void qmp_x_exit_preconfig(Error **errp) } } =20 +#ifdef CONFIG_MODULES +void qemu_load_module_for_opts(const char *group) +{ + static bool spice_tried; + if (g_str_equal(group, "spice") && !spice_tried) { + ui_module_load_one("spice-core"); + spice_tried =3D true; + } + + static bool iscsi_tried; + if (g_str_equal(group, "iscsi") && !iscsi_tried) { + block_module_load_one("iscsi"); + iscsi_tried =3D true; + } +} +#endif + void qemu_init(int argc, char **argv, char **envp) { QemuOpts *opts; @@ -3386,10 +3403,6 @@ void qemu_init(int argc, char **argv, char **envp) break; case QEMU_OPTION_spice: olist =3D qemu_find_opts_err("spice", NULL); - if (!olist) { - ui_module_load_one("spice-core"); - olist =3D qemu_find_opts("spice"); - } if (!olist) { error_report("spice support is disabled"); exit(1); diff --git a/stubs/meson.build b/stubs/meson.build index 3faef16892..f3f979c3fe 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -22,6 +22,7 @@ stub_ss.add(files('isa-bus.c')) stub_ss.add(files('is-daemonized.c')) stub_ss.add(when: 'CONFIG_LINUX_AIO', if_true: files('linux-aio.c')) stub_ss.add(files('migr-blocker.c')) +stub_ss.add(files('module-opts.c')) stub_ss.add(files('monitor.c')) stub_ss.add(files('monitor-core.c')) stub_ss.add(files('pci-bus.c')) diff --git a/stubs/module-opts.c b/stubs/module-opts.c new file mode 100644 index 0000000000..a7d0e4ad6e --- /dev/null +++ b/stubs/module-opts.c @@ -0,0 +1,6 @@ +#include "qemu/osdep.h" +#include "qemu/config-file.h" + +void qemu_load_module_for_opts(const char *group) +{ +} diff --git a/util/qemu-config.c b/util/qemu-config.c index 670bd6ebca..34974c4b47 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -16,6 +16,7 @@ static QemuOptsList *find_list(QemuOptsList **lists, cons= t char *group, { int i; =20 + qemu_load_module_for_opts(group); for (i =3D 0; lists[i] !=3D NULL; i++) { if (strcmp(lists[i]->name, group) =3D=3D 0) break; --=20 2.31.1