From patchwork Thu Jul 2 14:14:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Fedin X-Patchwork-Id: 490657 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 669DA140157 for ; Fri, 3 Jul 2015 00:19:25 +1000 (AEST) Received: from localhost ([::1]:36857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAfKl-0003sL-Ep for incoming@patchwork.ozlabs.org; Thu, 02 Jul 2015 10:19:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAfFq-0003lA-QX for qemu-devel@nongnu.org; Thu, 02 Jul 2015 10:14:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAfFp-0003SS-FL for qemu-devel@nongnu.org; Thu, 02 Jul 2015 10:14:18 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:32467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAfFp-0003Rq-8p for qemu-devel@nongnu.org; Thu, 02 Jul 2015 10:14:17 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NQV00DCE67S2BB0@mailout4.w1.samsung.com> for qemu-devel@nongnu.org; Thu, 02 Jul 2015 15:14:16 +0100 (BST) X-AuditID: cbfec7f4-f79c56d0000012ee-53-559547382962 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 74.35.04846.83745955; Thu, 2 Jul 2015 15:14:16 +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 <0NQV00E4O67RBK60@eusync3.samsung.com>; Thu, 02 Jul 2015 15:14:16 +0100 (BST) From: Pavel Fedin To: qemu-devel@nongnu.org Date: Thu, 02 Jul 2015 17:14:07 +0300 Message-id: <109fe2049d2c42f279cb38e75f5503267b0f1858.1435844519.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+NgFmplluLIzCtJLcpLzFFi42I5/e/4VV0L96mhBuuOc1nMOfOAxeJ47w4W ByaPO9f2sHk8ubaZKYApissmJTUnsyy1SN8ugSvj18TvzAW32CpOdRxka2CczNrFyMkhIWAi cad9OSOELSZx4d56ti5GLg4hgaWMElf2/2SCcL4xSmzt/sIEUsUmoC5x+usHFhBbREBS4nfX aWaQImaBR4wS19rOATkcHMIClhJXH/mA1LAIqEp8mn0dbAOvQLTEzWnL2CG2aUgs+jKHDcTm FDCXuP60CSwuJGAmcfBmGyMu8QmM/AsYGVYxiqaWJhcUJ6XnGuoVJ+YWl+al6yXn525ihATO lx2Mi49ZHWIU4GBU4uFdUTMlVIg1say4MvcQowQHs5II7xbLqaFCvCmJlVWpRfnxRaU5qcWH GKU5WJTEeefueh8iJJCeWJKanZpakFoEk2Xi4JRqYGQwcF6qf/hCeNWzaWufZtam1CnHNy1X fHRkat4nX8lyVYGA37crQ1/+WD5f1jb88YdDu+zSdRaEaKhoXvmuMGMO34/lypYVrGWNfbsV dX3U2KwPxGwxZtp3tPO4oaqnJ5OY58FdF0wvSeoXpc+/41QWG3c7JbjobY/ccoGM/v7dXVOj DjakKbEUZyQaajEXFScCABTGV4kYAgAA 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 v4 9/9] Enable KVM acceleration for GICv3 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 Instantiate "kvm-arm-gicv3" class for GICv3 with KVM acceleration Signed-off-by: Pavel Fedin --- hw/arm/virt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 5c07d07..100cb17 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -410,11 +410,9 @@ static void create_gic(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);