From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50640) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ywt2a-0006rJ-F5 for qemu-devel@nongnu.org; Mon, 25 May 2015 10:07:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ywt2W-0000g2-CU for qemu-devel@nongnu.org; Mon, 25 May 2015 10:07:40 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:36126) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ywt2W-0000fl-44 for qemu-devel@nongnu.org; Mon, 25 May 2015 10:07:36 -0400 Received: by wizk4 with SMTP id k4so49364882wiz.1 for ; Mon, 25 May 2015 07:07:35 -0700 (PDT) Message-ID: <55632C9E.2010903@linaro.org> Date: Mon, 25 May 2015 16:07:26 +0200 From: Eric Auger MIME-Version: 1.0 References: <748b8cfaf57df1e78bd5ea325943d6cb55a6668c.1432291291.git.p.fedin@samsung.com> In-Reply-To: <748b8cfaf57df1e78bd5ea325943d6cb55a6668c.1432291291.git.p.fedin@samsung.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH RFC 3/4] First bits of vGICv3 support: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pavel Fedin , qemu-devel@nongnu.org Cc: Shlomo Pongratz , Ashok Kumar On 05/22/2015 12:58 PM, Pavel Fedin wrote: > - Make use of kernel_irqchip_type in kvm_arch_irqchip_create() > - Instantiate "kvm-arm-gicv3" class (not implemented yet) for GICv3 with KVM acceleration I think this patch file should rather be the last one of the series. > > Signed-off-by: Pavel Fedin > --- > hw/arm/virt.c | 6 ++---- > include/sysemu/kvm.h | 3 ++- > kvm-all.c | 2 +- > stubs/kvm.c | 2 +- > target-arm/kvm.c | 8 ++++++-- > 5 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 15724b2..1e42e59 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -400,11 +400,9 @@ static uint32_t create_gic(const VirtBoardInfo *vbi, qemu_irq *pic, int type) > int i; > > if (type == KVM_DEV_TYPE_ARM_VGIC_V3) { > - gictype = "arm_gicv3"; > - } else if (kvm_irqchip_in_kernel()) { > - gictype = "kvm-arm-gic"; > + gictype = kvm_irqchip_in_kernel() ? "kvm-arm-gicv3" : "arm_gicv3"; > } else { > - gictype = "arm_gic"; > + gictype = kvm_irqchip_in_kernel() ? "kvm-arm-gic" : "arm_gic"; > } > > gicdev = qdev_create(NULL, gictype); > diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h > index 4878959..5d90257 100644 > --- a/include/sysemu/kvm.h > +++ b/include/sysemu/kvm.h > @@ -424,6 +424,7 @@ void kvm_init_irq_routing(KVMState *s); > /** > * kvm_arch_irqchip_create: > * @KVMState: The KVMState pointer > + * @type: irqchip type, architecture-specific > * > * Allow architectures to create an in-kernel irq chip themselves. > * > @@ -431,7 +432,7 @@ void kvm_init_irq_routing(KVMState *s); > * 0: irq chip was not created > * > 0: irq chip was created > */ > -int kvm_arch_irqchip_create(KVMState *s); > +int kvm_arch_irqchip_create(KVMState *s, int type); > > /** > * kvm_set_one_reg - set a register value in KVM via KVM_SET_ONE_REG ioctl > diff --git a/kvm-all.c b/kvm-all.c > index 17a3771..22e2621 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -1393,7 +1393,7 @@ static int kvm_irqchip_create(MachineState *machine, KVMState *s) > > /* First probe and see if there's a arch-specific hook to create the > * in-kernel irqchip for us */ > - ret = kvm_arch_irqchip_create(s); > + ret = kvm_arch_irqchip_create(s, machine->kernel_irqchip_type); > if (ret < 0) { > return ret; > } else if (ret == 0) { > diff --git a/stubs/kvm.c b/stubs/kvm.c > index e7c60b6..a8505ff 100644 > --- a/stubs/kvm.c > +++ b/stubs/kvm.c > @@ -1,7 +1,7 @@ > #include "qemu-common.h" > #include "sysemu/kvm.h" > > -int kvm_arch_irqchip_create(KVMState *s) > +int kvm_arch_irqchip_create(KVMState *s, int type) > { > return 0; > } > diff --git a/target-arm/kvm.c b/target-arm/kvm.c > index 16abbf1..65794cf 100644 > --- a/target-arm/kvm.c > +++ b/target-arm/kvm.c > @@ -579,7 +579,7 @@ void kvm_arch_init_irq_routing(KVMState *s) > { > } > > -int kvm_arch_irqchip_create(KVMState *s) > +int kvm_arch_irqchip_create(KVMState *s, int type) > { > int ret; > > @@ -587,11 +587,15 @@ int kvm_arch_irqchip_create(KVMState *s) > * let the device do this when it initializes itself, otherwise we > * fall back to the old API */ > > - ret = kvm_create_device(s, KVM_DEV_TYPE_ARM_VGIC_V2, true); > + ret = kvm_create_device(s, type, true); > if (ret == 0) { > return 1; > } > > + /* Fallback will create VGIC v2 */ the comment should be above return 0; > + if (type != KVM_DEV_TYPE_ARM_VGIC_V2) { > + return ret; > + } > return 0; > } > >