OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: Convert inject-nmi 

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Luiz Capitulino 2011-11-23 12:55:53 -02:00
parent e42e818bf4
commit ab49ab5c48
7 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cpus.c
View File

@ -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
}

3
hmp-commands.hx
View File

@ -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

8
hmp.c
View File

@ -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);
}

1
hmp.h
View File

@ -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

19
monitor.c
View File

@ -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);

13
qapi-schema.json
View File

@ -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' }

5
qmp-commands.hx
View File

@ -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