This provides a limited amount of info to plugins about the guest
system that will allow them to make some additional decisions on
setup.
Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
---
include/qemu/qemu-plugin.h | 26 ++++++++++++++++++++++++--
plugins/loader.c | 22 ++++++++++++++++++----
tests/plugin/bb.c | 5 +++--
tests/plugin/empty.c | 5 +++--
tests/plugin/hotblocks.c | 5 +++--
tests/plugin/hotpages.c | 5 +++--
tests/plugin/howvec.c | 5 +++--
tests/plugin/insn.c | 5 +++--
tests/plugin/mem.c | 5 +++--
9 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h
index 8b403dd615..719d7054a1 100644
--- a/include/qemu/qemu-plugin.h
+++ b/include/qemu/qemu-plugin.h
@@ -38,9 +38,27 @@
typedef uint64_t qemu_plugin_id_t;
+typedef struct {
+ /* string describing architecture */
+ const char *target_name;
+ /* is this a full system emulation? */
+ bool system_emulation;
+ union {
+ /*
+ * smp_vcpus may change if vCPUs can be hot-plugged, max_vcpus
+ * is the system-wide limit.
+ */
+ struct {
+ int smp_vcpus;
+ int max_vcpus;
+ } system;
+ };
+} qemu_info_t;
+
/**
* qemu_plugin_install() - Install a plugin
* @id: this plugin's opaque ID
+ * @info: a block describing some details about the guest
* @argc: number of arguments
* @argv: array of arguments (@argc elements)
*
@@ -49,10 +67,14 @@ typedef uint64_t qemu_plugin_id_t;
* Note: Calling qemu_plugin_uninstall() from this function is a bug. To raise
* an error during install, return !0.
*
+ * Note: @info is only live during the call. Copy any information we
+ * want to keep.
+ *
* Note: @argv remains valid throughout the lifetime of the loaded plugin.
*/
-QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, int argc,
- char **argv);
+QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
+ const qemu_info_t *info,
+ int argc, char **argv);
/*
* Prototypes for the various callback styles we will be registering
diff --git a/plugins/loader.c b/plugins/loader.c
index 5de5cff8e3..a136a71d35 100644
--- a/plugins/loader.c
+++ b/plugins/loader.c
@@ -29,6 +29,9 @@
#include "hw/core/cpu.h"
#include "cpu.h"
#include "exec/exec-all.h"
+#ifndef CONFIG_USER_ONLY
+#include "hw/boards.h"
+#endif
#include "plugin.h"
@@ -60,7 +63,7 @@ QemuOptsList qemu_plugin_opts = {
},
};
-typedef int (*qemu_plugin_install_func_t)(qemu_plugin_id_t, int, char **);
+typedef int (*qemu_plugin_install_func_t)(qemu_plugin_id_t, const qemu_info_t
*, int, char **);
extern struct qemu_plugin_state plugin;
@@ -147,7 +150,7 @@ static uint64_t xorshift64star(uint64_t x)
return x * UINT64_C(2685821657736338717);
}
-static int plugin_load(struct qemu_plugin_desc *desc)
+static int plugin_load(struct qemu_plugin_desc *desc, const qemu_info_t *info)
{
qemu_plugin_install_func_t install;
struct qemu_plugin_ctx *ctx;
@@ -198,7 +201,7 @@ static int plugin_load(struct qemu_plugin_desc *desc)
}
QTAILQ_INSERT_TAIL(&plugin.ctxs, ctx, entry);
ctx->installing = true;
- rc = install(ctx->id, desc->argc, desc->argv);
+ rc = install(ctx->id, info, desc->argc, desc->argv);
ctx->installing = false;
if (rc) {
error_report("%s: qemu_plugin_install returned error code %d",
@@ -249,11 +252,22 @@ static void plugin_desc_free(struct qemu_plugin_desc
*desc)
int qemu_plugin_load_list(QemuPluginList *head)
{
struct qemu_plugin_desc *desc, *next;
+ g_autofree qemu_info_t *info = g_new0(qemu_info_t, 1);
+
+ info->target_name = TARGET_NAME;
+#ifndef CONFIG_USER_ONLY
+ MachineState * ms = MACHINE(qdev_get_machine());
+ info->system_emulation = true;
+ info->system.smp_vcpus = ms->smp.cpus;
+ info->system.max_vcpus = ms->smp.max_cpus;
+#else
+ info->system_emulation = false;
+#endif
QTAILQ_FOREACH_SAFE(desc, head, entry, next) {
int err;
- err = plugin_load(desc);
+ err = plugin_load(desc, info);
if (err) {
return err;
}
diff --git a/tests/plugin/bb.c b/tests/plugin/bb.c
index 93d25de363..4a6d6ca0bc 100644
--- a/tests/plugin/bb.c
+++ b/tests/plugin/bb.c
@@ -48,8 +48,9 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct
qemu_plugin_tb *tb)
}
}
-QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, int argc,
- char **argv)
+QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
+ const qemu_info_t *info,
+ int argc, char **argv)
{
if (argc && strcmp(argv[0], "inline") == 0) {
do_inline = true;
diff --git a/tests/plugin/empty.c b/tests/plugin/empty.c
index b141ddd0df..3f60f69027 100644
--- a/tests/plugin/empty.c
+++ b/tests/plugin/empty.c
@@ -21,8 +21,9 @@
static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
{ }
-QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, int argc,
- char **argv)
+QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
+ const qemu_info_t *info,
+ int argc, char **argv)
{
qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans);
return 0;
diff --git a/tests/plugin/hotblocks.c b/tests/plugin/hotblocks.c
index a150179a5c..57bea765b3 100644
--- a/tests/plugin/hotblocks.c
+++ b/tests/plugin/hotblocks.c
@@ -129,8 +129,9 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct
qemu_plugin_tb *tb)
}
}
-QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, int argc,
- char **argv)
+QEMU_PLUGIN_EXPORT
+int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info,
+ int argc, char **argv)
{
if (argc && strcmp(argv[0], "inline") == 0) {
do_inline = true;
diff --git a/tests/plugin/hotpages.c b/tests/plugin/hotpages.c
index 13ce8ffeb8..99bb4be07c 100644
--- a/tests/plugin/hotpages.c
+++ b/tests/plugin/hotpages.c
@@ -148,8 +148,9 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct
qemu_plugin_tb *tb)
}
}
-QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, int argc,
- char **argv)
+QEMU_PLUGIN_EXPORT
+int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info,
+ int argc, char **argv)
{
int i;
diff --git a/tests/plugin/howvec.c b/tests/plugin/howvec.c
index b435c6b64d..3b1d177ef3 100644
--- a/tests/plugin/howvec.c
+++ b/tests/plugin/howvec.c
@@ -264,8 +264,9 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct
qemu_plugin_tb *tb)
}
}
-QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, int argc,
- char **argv)
+QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
+ const qemu_info_t *info,
+ int argc, char **argv)
{
int i;
diff --git a/tests/plugin/insn.c b/tests/plugin/insn.c
index 3000ab4b73..9cfa7d0e53 100644
--- a/tests/plugin/insn.c
+++ b/tests/plugin/insn.c
@@ -45,8 +45,9 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
dprintf(stdout_fd, "insns: %" PRIu64 "\n", insn_count);
}
-QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, int argc,
- char **argv)
+QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
+ const qemu_info_t *info,
+ int argc, char **argv)
{
if (argc && !strcmp(argv[0], "inline")) {
do_inline = true;
diff --git a/tests/plugin/mem.c b/tests/plugin/mem.c
index e5490f4a99..fdf4347c5e 100644
--- a/tests/plugin/mem.c
+++ b/tests/plugin/mem.c
@@ -64,8 +64,9 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct
qemu_plugin_tb *tb)
}
}
-QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, int argc,
- char **argv)
+QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
+ const qemu_info_t *info,
+ int argc, char **argv)
{
if (argc) {
if (argc >= 3) {
--
2.20.1
