On 03/30/2014 07:55 PM, Alexey Kardashevskiy wrote: > On 03/28/2014 11:51 PM, Alexey Kardashevskiy wrote: >> Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru> >> --- >> target-i386/cpu.c | 14 ++++++++++++++ >> 1 file changed, 14 insertions(+) >> >> diff --git a/target-i386/cpu.c b/target-i386/cpu.c >> index 8fd1497..35f20e0 100644 >> --- a/target-i386/cpu.c >> +++ b/target-i386/cpu.c >> @@ -2489,6 +2489,19 @@ static void x86_cpu_reset(CPUState *s) >> #endif >> } >> >> +static int x86_cpu_nmi(CPUState *cs) >> +{ >> + X86CPU *cpu = X86_CPU(cs); >> + >> + if (!cpu->apic_state) { >> + cpu_interrupt(cs, CPU_INTERRUPT_NMI); >> + } else { >> + apic_deliver_nmi(cpu->apic_state); > > This symbols is undefined for (i386|x86_64)-linux-user. > > What would be the right fix here? #ifndef CONFIG_USER_ONLY here or empty > stub for apic_deliver_nmi() in include/hw/i386/apic.h? Thanks.
The ifndef is the normal solution. r~