plugin: expand the plugin_init function to include an info block

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.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2019-09-12 17:24:27 +01:00
parent 26fffe29c0
commit 5901b2e15b
2 changed files with 43 additions and 6 deletions

View File

@ -38,9 +38,27 @@
typedef uint64_t qemu_plugin_id_t; 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 * qemu_plugin_install() - Install a plugin
* @id: this plugin's opaque ID * @id: this plugin's opaque ID
* @info: a block describing some details about the guest
* @argc: number of arguments * @argc: number of arguments
* @argv: array of arguments (@argc elements) * @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 * Note: Calling qemu_plugin_uninstall() from this function is a bug. To raise
* an error during install, return !0. * 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. * 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, QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
char **argv); const qemu_info_t *info,
int argc, char **argv);
/* /*
* Prototypes for the various callback styles we will be registering * Prototypes for the various callback styles we will be registering

View File

@ -28,6 +28,10 @@
#include "hw/core/cpu.h" #include "hw/core/cpu.h"
#include "cpu.h" #include "cpu.h"
#include "exec/exec-all.h" #include "exec/exec-all.h"
#ifndef CONFIG_USER_ONLY
#include "hw/boards.h"
#endif
#include "plugin.h" #include "plugin.h"
/* /*
@ -58,7 +62,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; extern struct qemu_plugin_state plugin;
@ -145,7 +149,7 @@ static uint64_t xorshift64star(uint64_t x)
return x * UINT64_C(2685821657736338717); 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; qemu_plugin_install_func_t install;
struct qemu_plugin_ctx *ctx; struct qemu_plugin_ctx *ctx;
@ -193,7 +197,7 @@ static int plugin_load(struct qemu_plugin_desc *desc)
} }
QTAILQ_INSERT_TAIL(&plugin.ctxs, ctx, entry); QTAILQ_INSERT_TAIL(&plugin.ctxs, ctx, entry);
ctx->installing = true; ctx->installing = true;
rc = install(ctx->id, desc->argc, desc->argv); rc = install(ctx->id, info, desc->argc, desc->argv);
ctx->installing = false; ctx->installing = false;
if (rc) { if (rc) {
error_report("%s: qemu_plugin_install returned error code %d", error_report("%s: qemu_plugin_install returned error code %d",
@ -241,11 +245,22 @@ static void plugin_desc_free(struct qemu_plugin_desc *desc)
int qemu_plugin_load_list(QemuPluginList *head) int qemu_plugin_load_list(QemuPluginList *head)
{ {
struct qemu_plugin_desc *desc, *next; 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) { QTAILQ_FOREACH_SAFE(desc, head, entry, next) {
int err; int err;
err = plugin_load(desc); err = plugin_load(desc, info);
if (err) { if (err) {
return err; return err;
} }