From patchwork Thu Aug 13 11:02:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Fedin X-Patchwork-Id: 506964 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 60B651402A3 for ; Thu, 13 Aug 2015 21:03:10 +1000 (AEST) Received: from localhost ([::1]:41793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPqHs-0003qw-9u for incoming@patchwork.ozlabs.org; Thu, 13 Aug 2015 07:03:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPqHA-0002h4-KC for qemu-devel@nongnu.org; Thu, 13 Aug 2015 07:02:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPqH7-0006Ei-AI for qemu-devel@nongnu.org; Thu, 13 Aug 2015 07:02:24 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:34184) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPqH7-0006B2-5h for qemu-devel@nongnu.org; Thu, 13 Aug 2015 07:02:21 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NT000KU4PBVV100@mailout4.w1.samsung.com> for qemu-devel@nongnu.org; Thu, 13 Aug 2015 12:02:19 +0100 (BST) X-AuditID: cbfec7f5-f794b6d000001495-48-55cc793b8b3c Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 64.98.05269.B397CC55; Thu, 13 Aug 2015 12:02:19 +0100 (BST) Received: from localhost ([106.109.131.169]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NT000C8SPBV9G30@eusync3.samsung.com>; Thu, 13 Aug 2015 12:02:19 +0100 (BST) From: Pavel Fedin To: qemu-devel@nongnu.org Date: Thu, 13 Aug 2015 14:02:14 +0300 Message-id: <5e880fd386a9ce3f52b2ddee409d5530e4d4ca25.1439462433.git.p.fedin@samsung.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-reply-to: References: In-reply-to: References: X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrELMWRmVeSWpSXmKPExsVy+t/xq7rWlWdCDe60a1q8eP2P0WL+ljOs FnPOPGCxON67g8Wi7fN3dou7rz+zOLB57Jx1l92j5chbVo871/aweTy5tpkpgCWKyyYlNSez LLVI3y6BK+P8dfGCWRwVP66+Z2lg3M7WxcjJISFgIrH09hlGCFtM4sK99WBxIYGljBLvHlt1 MXIB2d8YJY417mUGSbAJqEuc/vqBBcQWEZCU+N11mhmkiFngEaPE161nwIqEBRIlHu3tA5vE IqAqMeHGX1YQm1cgWqKzYRvUNg2JRV/mgNVwCphLbH0zmwVis5nE7Q2PmXCJT2DkX8DIsIpR NLU0uaA4KT3XSK84Mbe4NC9dLzk/dxMjJOS+7mBceszqEKMAB6MSD++GR6dDhVgTy4orcw8x SnAwK4nw3ks7EyrEm5JYWZValB9fVJqTWnyIUZqDRUmcd+au9yFCAumJJanZqakFqUUwWSYO TqkGRimj8y/YWP5MCLx19sWje9KBi05GBxdUZezfJK2c6/FDl/1yYaWQAcvUtqlMcQqNqSu/ lsybvXT9+iQjV2FWjSSxvd0Pqi4/O+W54kzNokP+r94sKs9/s/1E6zaNsxsNU6emez1Y3+e3 X7/1ire7n6Ese4Uun/LGJ7q+/0p8o44YV4j9n38rUomlOCPRUIu5qDgRAPCZFS81AgAA X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 210.118.77.14 Cc: Peter Maydell , Shlomo Pongratz , Shlomo Pongratz , Christoffer Dall , Eric Auger Subject: [Qemu-devel] [PATCH v9 3/5] arm_kvm: Do not assume particular GIC type in kvm_arch_irqchip_create() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This allows to use different GIC types from v2. There are no kernels which could advertise KVM_CAP_DEVICE_CTRL without the actual ability to create GIC with it. Signed-off-by: Pavel Fedin --- target-arm/kvm.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/target-arm/kvm.c b/target-arm/kvm.c index b278542..22383c5 100644 --- a/target-arm/kvm.c +++ b/target-arm/kvm.c @@ -585,18 +585,10 @@ void kvm_arch_init_irq_routing(KVMState *s) int kvm_arch_irqchip_create(KVMState *s) { - int ret; - /* If we can create the VGIC using the newer device control API, we * 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); - if (ret == 0) { - return 1; - } - - return 0; + return kvm_check_extension(s, KVM_CAP_DEVICE_CTRL); } int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,