On 20/05/2016 00:15, Bandan Das wrote:
> void qmp_inject_nmi(Error **errp)
> {
> -#if defined(TARGET_I386)
> - CPUState *cs;
> -
> - CPU_FOREACH(cs) {
> - X86CPU *cpu = X86_CPU(cs);
> -
> - if (!cpu->apic_state) {
> - cpu_interrupt(cs, CPU_INTERRUPT_NMI);
> - } else {
> - apic_deliver_nmi(cpu->apic_state);
> - }
> - }
> -#else
> - nmi_monitor_handle(monitor_get_cpu_index(), errp);
> -#endif
> + inject_nmi(errp);
This changes the first argument to nmi_monitor_handle in the !i386 case.
It should just remove the #ifdef, which I think makes the third patch
unnecessary. The first two patches are okay.
Paolo
