On Wed, Mar 23, 2016 at 03:33:25PM +0300, Sergey Fedorov wrote:
On 23/03/16 08:32, Peter Xu wrote:
diff --git a/target-arm/monitor.c b/target-arm/monitor.c index 254a9c9..4a2db59 100644 --- a/target-arm/monitor.c +++ b/target-arm/monitor.c @@ -21,8 +21,66 @@ (snip) GICCapabilityResult *qmp_query_gic_capabilities(Error **errp) { - return NULL; + GICCapabilityResult *result = g_new0(GICCapabilityResult, 1); + GICCapabilityList *head = NULL; + GICCapability *v2 = gic_cap_new(2), *v3 = gic_cap_new(3); + + v2->emulated = true; + /* FIXME: we'd change to true after we get emulated GICv3. */
Maybewe'd better use'NOTE:' or 'TODO:' instead of 'FIXME:'?
Right.
+ v3->emulated = false; + +#ifdef CONFIG_KVM + { + int fdarray[3]; + + if (!kvm_arm_create_scratch_host_vcpu(NULL, fdarray, NULL)) { + goto out; + } + + /* Test KVM GICv2 */ + if (kvm_support_device(fdarray[1], KVM_DEV_TYPE_ARM_VGIC_V2)) { + v2->kernel = true; + } + + /* Test KVM GICv3 */ + if (kvm_support_device(fdarray[1], KVM_DEV_TYPE_ARM_VGIC_V3)) { + v3->kernel = true; + } + + kvm_arm_destroy_scratch_host_vcpu(fdarray); +out: + ; + } +#endif
Probably, it would be neater to put KVM part into a separate static inline function.
Seems so. Will fix. Thanks. -- peterx