From nobody Mon Feb 9 23:40:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1564591572; cv=none; d=zoho.com; s=zohoarc; b=e1Y9ZHElYV7dyRRuvUqbji0f0MqOOSE5S1xHwXEM5qvjytwVf+LVdIHgIeB+oMbebxX4ubMmmkIKAX7tm6E+q771i0T/m1T4hJu7IFp65+NNK5Fku4jCu2/ZzarLR3DXiAWn152ZxKGo0DB+MjNyTbwgtivJPcnHZkesQ9Nmueg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564591572; h=Content-Type: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:ARC-Authentication-Results; bh=mjk2DnvfJD1k/p+MqNImwcO38VXfRv1NAD/8zcwI2MQ=; b=QnJ9IpoYwYbBcZNbTaTq+ooUGdtGBIDkmUUAOybkD8Sb3we6zMYp3kM7E5rXpt8/RV/BoNtIyRGwx4oFvouIeXLqnLySwzuAmyPGbqbgCDE9Qv41UycT5E8LMYBjjOMb9wNCdn5cT1NoCJxF2M0Wo8+ZxHDkaS6/97KiYtY03Gg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564591572612844.9562184368302; Wed, 31 Jul 2019 09:46:12 -0700 (PDT) Received: from localhost ([::1]:42996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsrjn-0002xe-4n for importer@patchew.org; Wed, 31 Jul 2019 12:46:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51208) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsrj3-0001h3-5T for qemu-devel@nongnu.org; Wed, 31 Jul 2019 12:45:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsrj2-0000qo-28 for qemu-devel@nongnu.org; Wed, 31 Jul 2019 12:45:17 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:43165) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hsrj1-0000oz-QS for qemu-devel@nongnu.org; Wed, 31 Jul 2019 12:45:15 -0400 Received: by mail-wr1-x42f.google.com with SMTP id p13so70408859wru.10 for ; Wed, 31 Jul 2019 09:45:15 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z5sm49307630wmf.48.2019.07.31.09.45.13 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 09:45:13 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8C49B1FFC2; Wed, 31 Jul 2019 17:07:23 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mjk2DnvfJD1k/p+MqNImwcO38VXfRv1NAD/8zcwI2MQ=; b=vf3Qhf4qL45sidOgROi8Ul9+tgpNUnxyKODPFMrd5NpW+c3Yya3bnu3xPP6Qm2Xo2z jYsDmCrBSX8Ehlqx3GK3X9DbewB+nZFp5Jh5xy4GbT8Ff0idt1VXCeIKp926jAohQhVB IBSEZXUb3E+e0Ef7KIoXlHP/3Uh6kexxfeObgcycullKID62vZGMlFq6leHxaZoIwZbN itHyHHnPA3kk2/yNEQcbRARG3OYAwG69XnldtFXfqmrbIBc+iljlJV8wmJwJg0ys1wV5 UFxyxs2/C2785hrgov1RaNoXr+5gOOdzaQkOywuR994lE+aAmT6jR4GqgmXFWfQD3hSe vo1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mjk2DnvfJD1k/p+MqNImwcO38VXfRv1NAD/8zcwI2MQ=; b=jIEWQuy2n3yL1jhNaLJ4G9AbzsyYspRrCa59rZTXFkwGFHGGv+QxXppWyq585Ft+ZG V1gImozwWnc0sKlOrCfsOLX/PEmQqmTejsSZnceFmK4yGz6/Ynz9QJ8of3OiNoPB+5fT KGXx02oy94TgZoEL5+ueOeTBmdHnOmRdMyI+FmXWv8G1WJWvRKkkvDff5041bDDUXo3l zTNrK+bzhrwgxrXXTsVHv4Z2Yksy56tBx9wXV4AHeub3wgyHXorJSeyaM/Drjminn5CW KfLMlzanceXSYZxWF19fNlkDiQ+za6LVWZZbHHiShIlIOmPdhbWdT/A5tQ+aNgNag09o bElA== X-Gm-Message-State: APjAAAUWsTkWPUk1VnSKziXOWfXQEIkxng66IhZLc98vuALeJNajAf+/ C1PqNN48guUYHVPv90yyBKi4940HjUE= X-Google-Smtp-Source: APXvYqxZmJZr7PKRMxVZgJU5+u0tZYUHVe0M2VFciORbq0cG3ExDZ2sjLa+yj3wXpEzcsPQ+xO+7lw== X-Received: by 2002:adf:ed41:: with SMTP id u1mr129156373wro.162.1564591514200; Wed, 31 Jul 2019 09:45:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 17:07:09 +0100 Message-Id: <20190731160719.11396-45-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190731160719.11396-1-alex.bennee@linaro.org> References: <20190731160719.11396-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f Subject: [Qemu-devel] [PATCH v4 44/54] vl: support -plugin option 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: Richard Henderson , aaron@os.amperecomputing.com, cota@braap.org, Paolo Bonzini , bobby.prani@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Llu=C3=ADs Vilanova Signed-off-by: Llu=C3=ADs Vilanova [ cota: s/instrument/plugin ] Signed-off-by: Emilio G. Cota Reviewed-by: Richard Henderson Signed-off-by: Alex Benn=C3=A9e --- qemu-options.hx | 17 +++++++++++++++++ vl.c | 11 +++++++++++ 2 files changed, 28 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx index 9621e934c0b..7b438f61734 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4131,6 +4131,23 @@ HXCOMM HX does not support conditional compilation o= f text. @findex -trace @include qemu-option-trace.texi ETEXI +DEF("plugin", HAS_ARG, QEMU_OPTION_plugin, + "-plugin [file=3D][,arg=3D]\n" + " load a plugin\n", + QEMU_ARCH_ALL) +STEXI +@item -plugin file=3D@var{file}[,arg=3D@var{string}] +@findex -plugin + +Load a plugin. + +@table @option +@item file=3D@var{file} +Load the given plugin from a shared library file. +@item arg=3D@var{string} +Argument string passed to the plugin. (Can be given multiple times.) +@end table +ETEXI =20 HXCOMM Internal use DEF("qtest", HAS_ARG, QEMU_OPTION_qtest, "", QEMU_ARCH_ALL) diff --git a/vl.c b/vl.c index b426b321346..bb62989f776 100644 --- a/vl.c +++ b/vl.c @@ -109,6 +109,7 @@ int main(int argc, char **argv) =20 #include "trace-root.h" #include "trace/control.h" +#include "qemu/plugin.h" #include "qemu/queue.h" #include "sysemu/arch_init.h" =20 @@ -2889,6 +2890,7 @@ int main(int argc, char **argv, char **envp) bool list_data_dirs =3D false; char *dir, **dirs; BlockdevOptionsQueue bdo_queue =3D QSIMPLEQ_HEAD_INITIALIZER(bdo_queue= ); + QemuPluginList plugin_list =3D QTAILQ_HEAD_INITIALIZER(plugin_list); =20 os_set_line_buffering(); =20 @@ -2919,6 +2921,7 @@ int main(int argc, char **argv, char **envp) qemu_add_opts(&qemu_global_opts); qemu_add_opts(&qemu_mon_opts); qemu_add_opts(&qemu_trace_opts); + qemu_plugin_add_opts(); qemu_add_opts(&qemu_option_rom_opts); qemu_add_opts(&qemu_machine_opts); qemu_add_opts(&qemu_accel_opts); @@ -3697,6 +3700,9 @@ int main(int argc, char **argv, char **envp) g_free(trace_file); trace_file =3D trace_opt_parse(optarg); break; + case QEMU_OPTION_plugin: + qemu_plugin_opt_parse(optarg, &plugin_list); + break; case QEMU_OPTION_readconfig: { int ret =3D qemu_read_config_file(optarg); @@ -4010,6 +4016,11 @@ int main(int argc, char **argv, char **envp) machine_class->default_machine_opts, 0); } =20 + /* process plugin before CPUs are created, but once -smp has been pars= ed */ + if (qemu_plugin_load_list(&plugin_list)) { + exit(1); + } + qemu_opts_foreach(qemu_find_opts("device"), default_driver_check, NULL, NULL); qemu_opts_foreach(qemu_find_opts("global"), --=20 2.20.1