From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXUJo-0001LD-Rn for qemu-devel@nongnu.org; Mon, 16 Mar 2015 08:40:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXUJn-0005cd-Ph for qemu-devel@nongnu.org; Mon, 16 Mar 2015 08:40:28 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:55251) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXUJn-0005PR-Iw for qemu-devel@nongnu.org; Mon, 16 Mar 2015 08:40:27 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1YXUJf-00078v-2T for qemu-devel@nongnu.org; Mon, 16 Mar 2015 12:40:19 +0000 From: Peter Maydell Date: Mon, 16 Mar 2015 12:40:15 +0000 Message-Id: <1426509618-27416-5-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1426509618-27416-1-git-send-email-peter.maydell@linaro.org> References: <1426509618-27416-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 4/7] hw/intc/arm_gic: Initialize the vgic in the realize function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Eric Auger This patch forces vgic initialization in the vgic realize function. It uses a new group/attribute that allows such operation: KVM_DEV_ARM_VGIC_GRP_CTRL/KVM_DEV_ARM_VGIC_CTRL_INIT This earlier initialization allows, for example, to setup VFIO signaling and irqfd after vgic initialization, on a reset notifier. Signed-off-by: Eric Auger Message-id: 1426094226-8515-1-git-send-email-eric.auger@linaro.org Signed-off-by: Peter Maydell --- hw/intc/arm_gic_kvm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c index 1ad3eb0..0d20750 100644 --- a/hw/intc/arm_gic_kvm.c +++ b/hw/intc/arm_gic_kvm.c @@ -573,6 +573,13 @@ static void kvm_arm_gic_realize(DeviceState *dev, Error **errp) kvm_gic_access(s, KVM_DEV_ARM_VGIC_GRP_NR_IRQS, 0, 0, &numirqs, 1); } + /* Tell the kernel to complete VGIC initialization now */ + if (kvm_gic_supports_attr(s, KVM_DEV_ARM_VGIC_GRP_CTRL, + KVM_DEV_ARM_VGIC_CTRL_INIT)) { + kvm_gic_access(s, KVM_DEV_ARM_VGIC_GRP_CTRL, + KVM_DEV_ARM_VGIC_CTRL_INIT, 0, 0, 1); + } + /* Distributor */ memory_region_init_reservation(&s->iomem, OBJECT(s), "kvm-gic_dist", 0x1000); -- 1.9.1