diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-08 12:16:24 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-08 12:16:24 -0500 |
| commit | 924f766af9be3ff036a419fc85ed740aa01f8eac (patch) | |
| tree | 8e645fa4dc1be00eb06df8cab7a0501a64cffe55 /monitor.c | |
| parent | 93e0597ef9fa266756c30e61fafe4b70fc7ce6a6 (diff) | |
| parent | 37628f11c6b190ebb3082938868aadb23942ee3a (diff) | |
| download | focaccia-qemu-924f766af9be3ff036a419fc85ed740aa01f8eac.tar.gz focaccia-qemu-924f766af9be3ff036a419fc85ed740aa01f8eac.zip | |
Merge remote-tracking branch 'qmp/for-anthony' into staging
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/monitor.c b/monitor.c index f63cce050f..6af6a4d999 100644 --- a/monitor.c +++ b/monitor.c @@ -2544,16 +2544,21 @@ static void do_wav_capture(Monitor *mon, const QDict *qdict) #endif #if defined(TARGET_I386) -static void do_inject_nmi(Monitor *mon, const QDict *qdict) +static int do_inject_nmi(Monitor *mon, const QDict *qdict, QObject **ret_data) { CPUState *env; - int cpu_index = qdict_get_int(qdict, "cpu_index"); - for (env = first_cpu; env != NULL; env = env->next_cpu) - if (env->cpu_index == cpu_index) { - cpu_interrupt(env, CPU_INTERRUPT_NMI); - break; - } + 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 |