From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aj1O5-00005u-OA for qemu-devel@nongnu.org; Thu, 24 Mar 2016 05:17:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aj1O1-0004mh-Mu for qemu-devel@nongnu.org; Thu, 24 Mar 2016 05:17:05 -0400 References: <1458788142-17509-1-git-send-email-peterx@redhat.com> <1458788142-17509-5-git-send-email-peterx@redhat.com> From: Sergey Fedorov Message-ID: <56F3B084.2050604@gmail.com> Date: Thu, 24 Mar 2016 12:16:52 +0300 MIME-Version: 1.0 In-Reply-To: <1458788142-17509-5-git-send-email-peterx@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v7 4/4] arm: implement query-gic-capabilities List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu , qemu-devel@nongnu.org Cc: wei@redhat.com, peter.maydell@linaro.org, drjones@redhat.com, mdroth@linux.vnet.ibm.com, libvir-list@redhat.com, armbru@redhat.com, abologna@redhat.com, qemu-arm@nongnu.org, christoffer.dall@linaro.org On 24/03/16 05:55, Peter Xu wrote: > For emulated GIC capabilities, currently only gicv2 is supported. We > need to add gicv3 in when emulated gicv3 ready. For KVM accelerated ARM > VM, we detect the capability bits by creating a scratch VM. > > Signed-off-by: Peter Xu Acked-by: Sergey Fedorov Kind regards, Sergey > --- > target-arm/monitor.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 57 insertions(+), 1 deletion(-) > > diff --git a/target-arm/monitor.c b/target-arm/monitor.c > index 4c9bef3..1ee59a2 100644 > --- a/target-arm/monitor.c > +++ b/target-arm/monitor.c > @@ -21,8 +21,64 @@ > */ > #include "qemu/osdep.h" > #include "qmp-commands.h" > +#include "hw/boards.h" > +#include "kvm_arm.h" > + > +static GICCapability *gic_cap_new(int version) > +{ > + GICCapability *cap = g_new0(GICCapability, 1); > + cap->version = version; > + /* by default, support none */ > + cap->emulated = false; > + cap->kernel = false; > + return cap; > +} > + > +static GICCapabilityList *gic_cap_list_add(GICCapabilityList *head, > + GICCapability *cap) > +{ > + GICCapabilityList *item = g_new0(GICCapabilityList, 1); > + item->value = cap; > + item->next = head; > + return item; > +} > + > +static inline void gic_cap_kvm_probe(GICCapability *v2, GICCapability *v3) > +{ > +#ifdef CONFIG_KVM > + int fdarray[3]; > + > + if (!kvm_arm_create_scratch_host_vcpu(NULL, fdarray, NULL)) { > + return; > + } > + > + /* Test KVM GICv2 */ > + if (kvm_device_supported(fdarray[1], KVM_DEV_TYPE_ARM_VGIC_V2)) { > + v2->kernel = true; > + } > + > + /* Test KVM GICv3 */ > + if (kvm_device_supported(fdarray[1], KVM_DEV_TYPE_ARM_VGIC_V3)) { > + v3->kernel = true; > + } > + > + kvm_arm_destroy_scratch_host_vcpu(fdarray); > +#endif > +} > > GICCapabilityList *qmp_query_gic_capabilities(Error **errp) > { > - return NULL; > + GICCapabilityList *head = NULL; > + GICCapability *v2 = gic_cap_new(2), *v3 = gic_cap_new(3); > + > + v2->emulated = true; > + /* TODO: we'd change to true after we get emulated GICv3. */ > + v3->emulated = false; > + > + gic_cap_kvm_probe(v2, v3); > + > + head = gic_cap_list_add(head, v2); > + head = gic_cap_list_add(head, v3); > + > + return head; > }