[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/16] qapi: Convert inject-nmi
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 07/16] qapi: Convert inject-nmi |
Date: |
Mon, 5 Dec 2011 18:00:17 -0200 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
cpus.c | 13 +++++++++++++
hmp-commands.hx | 3 +--
hmp.c | 8 ++++++++
hmp.h | 1 +
monitor.c | 19 -------------------
qapi-schema.json | 13 +++++++++++++
qmp-commands.hx | 5 +----
7 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/cpus.c b/cpus.c
index e916137..7b9f8eb 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1213,3 +1213,16 @@ void qmp_pmemsave(int64_t addr, int64_t size, const char
*filename,
exit:
fclose(f);
}
+
+void qmp_inject_nmi(Error **errp)
+{
+#if defined(TARGET_I386)
+ CPUState *env;
+
+ for (env = first_cpu; env != NULL; env = env->next_cpu) {
+ cpu_interrupt(env, CPU_INTERRUPT_NMI);
+ }
+#else
+ error_set(errp, QERR_UNSUPPORTED);
+#endif
+}
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 9503751..b82aff8 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -736,8 +736,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "inject an NMI on all guest's CPUs",
- .user_print = monitor_user_noop,
- .mhandler.cmd_new = do_inject_nmi,
+ .mhandler.cmd = hmp_inject_nmi,
},
#endif
STEXI
diff --git a/hmp.c b/hmp.c
index d623526..0ebc398 100644
--- a/hmp.c
+++ b/hmp.c
@@ -593,3 +593,11 @@ void hmp_cont(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, &errp);
}
}
+
+void hmp_inject_nmi(Monitor *mon, const QDict *qdict)
+{
+ Error *errp = NULL;
+
+ qmp_inject_nmi(&errp);
+ hmp_handle_error(mon, &errp);
+}
diff --git a/hmp.h b/hmp.h
index b034704..8a31f87 100644
--- a/hmp.h
+++ b/hmp.h
@@ -40,5 +40,6 @@ void hmp_cpu(Monitor *mon, const QDict *qdict);
void hmp_memsave(Monitor *mon, const QDict *qdict);
void hmp_pmemsave(Monitor *mon, const QDict *qdict);
void hmp_cont(Monitor *mon, const QDict *qdict);
+void hmp_inject_nmi(Monitor *mon, const QDict *qdict);
#endif
diff --git a/monitor.c b/monitor.c
index b0d1862..62b1747 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2204,25 +2204,6 @@ static void do_wav_capture(Monitor *mon, const QDict
*qdict)
}
#endif
-#if defined(TARGET_I386)
-static int do_inject_nmi(Monitor *mon, const QDict *qdict, QObject **ret_data)
-{
- CPUState *env;
-
- for (env = first_cpu; env != NULL; env = env->next_cpu) {
- cpu_interrupt(env, CPU_INTERRUPT_NMI);
- }
-
- return 0;
-}
-#else
-static int do_inject_nmi(Monitor *mon, const QDict *qdict, QObject **ret_data)
-{
- qerror_report(QERR_UNSUPPORTED);
- return -1;
-}
-#endif
-
static qemu_acl *find_acl(Monitor *mon, const char *name)
{
qemu_acl *acl = qemu_acl_find(name);
diff --git a/qapi-schema.json b/qapi-schema.json
index b6fd3f1..fea513f 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -966,3 +966,16 @@
##
{ 'command': 'cont' }
+##
+# @inject-nmi:
+#
+# Injects an Non-Maskable Interrupt into all guest's VCPUs.
+#
+# Returns: If successful, nothing
+# If the Virtual Machine doesn't support NMI injection, Unsupported
+#
+# Since: 0.14.0
+#
+# Notes: Only x86 Virtual Machines support this command.
+##
+{ 'command': 'inject-nmi' }
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 03b2617..2e76708 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -407,10 +407,7 @@ EQMP
{
.name = "inject-nmi",
.args_type = "",
- .params = "",
- .help = "",
- .user_print = monitor_user_noop,
- .mhandler.cmd_new = do_inject_nmi,
+ .mhandler.cmd_new = qmp_marshal_input_inject_nmi,
},
SQMP
--
1.7.8.dirty
- [Qemu-devel] [PATCH v2 00/16]: QAPI conversions round 3, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 02/16] console: Drop unused prototypes, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 04/16] qapi: Convert memsave, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 01/16] qapi: Complete system_powerdown conversion, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 06/16] qapi: Convert cont, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 07/16] qapi: Convert inject-nmi,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 05/16] qapi: Convert pmemsave, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 08/16] qapi: Convert set_link, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 03/16] QError: Introduce QERR_IO_ERROR, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 09/16] qapi: Convert block_passwd, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 10/16] qapi: Convert balloon, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 13/16] qapi: Convert human-monitor-command, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 11/16] qapi: Convert block_resize, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 14/16] qapi: Convert migrate_cancel, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 15/16] qapi: Convert migrate_set_downtime, Luiz Capitulino, 2011/12/05
- [Qemu-devel] [PATCH 16/16] qapi: Convert migrate_set_speed, Luiz Capitulino, 2011/12/05