[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 11/13] qemu/plugin: Move !CONFIG_PLUGIN stubs altogether
From: |
Alex Bennée |
Subject: |
[PULL v2 11/13] qemu/plugin: Move !CONFIG_PLUGIN stubs altogether |
Date: |
Fri, 15 May 2020 15:44:03 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
Simplify the ifdef'ry by moving all stubs together.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Emilio G. Cota <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Message-Id: <address@hidden>
Message-Id: <address@hidden>
diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h
index e45f950fe36..ab790ad105c 100644
--- a/include/qemu/plugin.h
+++ b/include/qemu/plugin.h
@@ -46,22 +46,6 @@ static inline void qemu_plugin_add_opts(void)
void qemu_plugin_opt_parse(const char *optarg, QemuPluginList *head);
int qemu_plugin_load_list(QemuPluginList *head);
-#else /* !CONFIG_PLUGIN */
-static inline void qemu_plugin_add_opts(void)
-{ }
-
-static inline void qemu_plugin_opt_parse(const char *optarg,
- QemuPluginList *head)
-{
- error_report("plugin interface not enabled in this build");
- exit(1);
-}
-
-static inline int qemu_plugin_load_list(QemuPluginList *head)
-{
- return 0;
-}
-#endif /* !CONFIG_PLUGIN */
union qemu_plugin_cb_sig {
qemu_plugin_simple_cb_t simple;
@@ -182,8 +166,6 @@ struct qemu_plugin_insn *qemu_plugin_tb_insn_get(struct
qemu_plugin_tb *tb)
return insn;
}
-#ifdef CONFIG_PLUGIN
-
void qemu_plugin_vcpu_init_hook(CPUState *cpu);
void qemu_plugin_vcpu_exit_hook(CPUState *cpu);
void qemu_plugin_tb_trans_cb(CPUState *cpu, struct qemu_plugin_tb *tb);
@@ -207,6 +189,21 @@ void qemu_plugin_disable_mem_helpers(CPUState *cpu);
#else /* !CONFIG_PLUGIN */
+static inline void qemu_plugin_add_opts(void)
+{ }
+
+static inline void qemu_plugin_opt_parse(const char *optarg,
+ QemuPluginList *head)
+{
+ error_report("plugin interface not enabled in this build");
+ exit(1);
+}
+
+static inline int qemu_plugin_load_list(QemuPluginList *head)
+{
+ return 0;
+}
+
static inline void qemu_plugin_vcpu_init_hook(CPUState *cpu)
{ }
--
2.20.1
- [PULL v2 00/13] testing, tcg and plugin updates, Alex Bennée, 2020/05/15
- [PULL v2 01/13] tests/guest-debug: catch hanging guests, Alex Bennée, 2020/05/15
- [PULL v2 02/13] travis.yml: Improve the --disable-tcg test on s390x, Alex Bennée, 2020/05/15
- [PULL v2 04/13] exec/cpu-all: Use bool for have_guest_base, Alex Bennée, 2020/05/15
- [PULL v2 05/13] accel/tcg: Relax va restrictions on 64-bit guests, Alex Bennée, 2020/05/15
- [PULL v2 09/13] translate-all: include guest address in out_asm output, Alex Bennée, 2020/05/15
- [PULL v2 03/13] linux-user: completely re-write init_guest_space, Alex Bennée, 2020/05/15
- [PULL v2 06/13] accel/tcg: don't disable exec_tb trace events, Alex Bennée, 2020/05/15
- [PULL v2 08/13] disas: add optional note support to cap_disas, Alex Bennée, 2020/05/15
- [PULL v2 07/13] disas: include an optional note for the start of disassembly, Alex Bennée, 2020/05/15
- [PULL v2 11/13] qemu/plugin: Move !CONFIG_PLUGIN stubs altogether,
Alex Bennée <=
- [PULL v2 10/13] qemu/plugin: Trivial code movement, Alex Bennée, 2020/05/15
- [PULL v2 13/13] MAINTAINERS: update the orphaned cpus-common.c file, Alex Bennée, 2020/05/15
- [PULL v2 12/13] qemu/qemu-plugin: Make qemu_plugin_hwaddr_is_io() hwaddr argument const, Alex Bennée, 2020/05/15
- Re: [PULL v2 00/13] testing, tcg and plugin updates, Peter Maydell, 2020/05/15