From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [RFC v2 2/6] ARM: KVM: Add support for KVM on ARM architecture Date: Thu, 18 Oct 2012 19:41:19 +0200 Message-ID: <50803F3F.1010609@siemens.com> References: <1349881659-8403-1-git-send-email-peter.maydell@linaro.org> <1349881659-8403-3-git-send-email-peter.maydell@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: patches@linaro.org, qemu-devel@nongnu.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu To: Peter Maydell Return-path: In-Reply-To: <1349881659-8403-3-git-send-email-peter.maydell@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org List-Id: kvm.vger.kernel.org On 2012-10-10 17:07, Peter Maydell wrote: > From: Christoffer Dall > > Add basic support for KVM on ARM architecture. > > Signed-off-by: Christoffer Dall > [PMM: Minor tweaks and code cleanup, switch to ONE_REG] > Signed-off-by: Peter Maydell > --- > hw/arm_pic.c | 28 ++++ > target-arm/Makefile.objs | 1 + > target-arm/cpu.h | 1 + > target-arm/helper.c | 2 +- > target-arm/kvm.c | 328 ++++++++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 359 insertions(+), 1 deletion(-) > create mode 100644 target-arm/kvm.c > > diff --git a/hw/arm_pic.c b/hw/arm_pic.c > index ffb4d41..72272dc 100644 > --- a/hw/arm_pic.c > +++ b/hw/arm_pic.c > @@ -9,6 +9,7 @@ > > #include "hw.h" > #include "arm-misc.h" > +#include "kvm.h" > > /* Input 0 is IRQ and input 1 is FIQ. */ > static void arm_pic_cpu_handler(void *opaque, int irq, int level) > @@ -34,7 +35,34 @@ static void arm_pic_cpu_handler(void *opaque, int irq, int level) > } > } > > +#ifdef CONFIG_KVM > +static void kvm_arm_pic_cpu_handler(void *opaque, int irq, int level) > +{ > + ARMCPU *cpu = opaque; > + CPUARMState *env = &cpu->env; > + int kvm_irq = KVM_ARM_IRQ_TYPE_CPU << KVM_ARM_IRQ_TYPE_SHIFT; > + > + switch (irq) { > + case ARM_PIC_CPU_IRQ: > + kvm_irq |= KVM_ARM_IRQ_CPU_IRQ; > + break; > + case ARM_PIC_CPU_FIQ: > + kvm_irq |= KVM_ARM_IRQ_CPU_FIQ; > + break; > + default: > + hw_error("kvm_arm_pic_cpu_handler: Bad interrupt line %d\n", irq); > + } > + kvm_irq |= env->cpu_index << KVM_ARM_IRQ_VCPU_SHIFT; > + kvm_set_irq(kvm_state, kvm_irq, level ? 1 : 0); > +} > +#endif Minor: If you do function() { #ifdef CONFIG_KVM ... #endif } > + > qemu_irq *arm_pic_init_cpu(ARMCPU *cpu) > { > +#ifdef CONFIG_KVM > + if (kvm_enabled()) { > + return qemu_allocate_irqs(kvm_arm_pic_cpu_handler, cpu, 2); > + } > +#endif ...you can avoid the ifdef'ery here. Jan -- Siemens AG, Corporate Technology, CT RTC ITP SDP-DE Corporate Competence Center Embedded Linux From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOu66-0002lX-86 for qemu-devel@nongnu.org; Thu, 18 Oct 2012 13:41:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOu64-0007Ni-Qy for qemu-devel@nongnu.org; Thu, 18 Oct 2012 13:41:30 -0400 Received: from david.siemens.de ([192.35.17.14]:22855) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOu64-0007NK-Go for qemu-devel@nongnu.org; Thu, 18 Oct 2012 13:41:28 -0400 Message-ID: <50803F3F.1010609@siemens.com> Date: Thu, 18 Oct 2012 19:41:19 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <1349881659-8403-1-git-send-email-peter.maydell@linaro.org> <1349881659-8403-3-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1349881659-8403-3-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC v2 2/6] ARM: KVM: Add support for KVM on ARM architecture List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: patches@linaro.org, qemu-devel@nongnu.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu On 2012-10-10 17:07, Peter Maydell wrote: > From: Christoffer Dall > > Add basic support for KVM on ARM architecture. > > Signed-off-by: Christoffer Dall > [PMM: Minor tweaks and code cleanup, switch to ONE_REG] > Signed-off-by: Peter Maydell > --- > hw/arm_pic.c | 28 ++++ > target-arm/Makefile.objs | 1 + > target-arm/cpu.h | 1 + > target-arm/helper.c | 2 +- > target-arm/kvm.c | 328 ++++++++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 359 insertions(+), 1 deletion(-) > create mode 100644 target-arm/kvm.c > > diff --git a/hw/arm_pic.c b/hw/arm_pic.c > index ffb4d41..72272dc 100644 > --- a/hw/arm_pic.c > +++ b/hw/arm_pic.c > @@ -9,6 +9,7 @@ > > #include "hw.h" > #include "arm-misc.h" > +#include "kvm.h" > > /* Input 0 is IRQ and input 1 is FIQ. */ > static void arm_pic_cpu_handler(void *opaque, int irq, int level) > @@ -34,7 +35,34 @@ static void arm_pic_cpu_handler(void *opaque, int irq, int level) > } > } > > +#ifdef CONFIG_KVM > +static void kvm_arm_pic_cpu_handler(void *opaque, int irq, int level) > +{ > + ARMCPU *cpu = opaque; > + CPUARMState *env = &cpu->env; > + int kvm_irq = KVM_ARM_IRQ_TYPE_CPU << KVM_ARM_IRQ_TYPE_SHIFT; > + > + switch (irq) { > + case ARM_PIC_CPU_IRQ: > + kvm_irq |= KVM_ARM_IRQ_CPU_IRQ; > + break; > + case ARM_PIC_CPU_FIQ: > + kvm_irq |= KVM_ARM_IRQ_CPU_FIQ; > + break; > + default: > + hw_error("kvm_arm_pic_cpu_handler: Bad interrupt line %d\n", irq); > + } > + kvm_irq |= env->cpu_index << KVM_ARM_IRQ_VCPU_SHIFT; > + kvm_set_irq(kvm_state, kvm_irq, level ? 1 : 0); > +} > +#endif Minor: If you do function() { #ifdef CONFIG_KVM ... #endif } > + > qemu_irq *arm_pic_init_cpu(ARMCPU *cpu) > { > +#ifdef CONFIG_KVM > + if (kvm_enabled()) { > + return qemu_allocate_irqs(kvm_arm_pic_cpu_handler, cpu, 2); > + } > +#endif ...you can avoid the ifdef'ery here. Jan -- Siemens AG, Corporate Technology, CT RTC ITP SDP-DE Corporate Competence Center Embedded Linux