From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [PATCH 1/6] qemu,kvm: Enable NMI support for user space irqchip Date: Thu, 09 Dec 2010 08:25:19 +0100 Message-ID: <4D00845F.9000503@siemens.com> References: <4D007E2C.4070308@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Avi Kivity , "qemu-devel@nongnu.org" , "kvm@vger.kernel.org" To: Lai Jiangshan Return-path: Received: from goliath.siemens.de ([192.35.17.28]:16645 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751156Ab0LIHZq (ORCPT ); Thu, 9 Dec 2010 02:25:46 -0500 In-Reply-To: <4D007E2C.4070308@cn.fujitsu.com> Sender: kvm-owner@vger.kernel.org List-ID: Am 09.12.2010 07:58, Lai Jiangshan wrote: > > Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the > user space APIC emulation or some other source raised them. In that light, the subject is not absolutely correct. > > Signed-off-by: Lai Jiangshan > --- > diff --git a/target-i386/kvm.c b/target-i386/kvm.c > index 7dfc357..c4ebe28 100644 > --- a/target-i386/kvm.c > +++ b/target-i386/kvm.c > @@ -1417,6 +1417,14 @@ int kvm_arch_get_registers(CPUState *env) > > int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) > { > +#ifdef KVM_CAP_USER_NMI > + if (env->interrupt_request & CPU_INTERRUPT_NMI) { > + env->interrupt_request &= ~CPU_INTERRUPT_NMI; > + DPRINTF("injected NMI\n"); > + kvm_vcpu_ioctl(env, KVM_NMI); > + } > +#endif > + > /* Try to inject an interrupt if the guest can accept it */ > if (run->ready_for_interrupt_injection && > (env->interrupt_request & CPU_INTERRUPT_HARD) && Actually, we already depend on KVM_CAP_DESTROY_MEMORY_REGION_WORKS which was introduced with 2.6.29 as well. I would suggest to simply extend the static configure check and avoid new #ifdefs in the code. Thanks for pushing this! Was obviously so trivial that it was forgotten... Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux