From patchwork Wed Feb 6 12:12:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 2104001 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id CF52BDF2A1 for ; Wed, 6 Feb 2013 12:12:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753390Ab3BFMMm (ORCPT ); Wed, 6 Feb 2013 07:12:42 -0500 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:42646 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753276Ab3BFMMm (ORCPT ); Wed, 6 Feb 2013 07:12:42 -0500 Received: from mudshark.cambridge.arm.com (mudshark.cambridge.arm.com [10.1.79.58]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id r16CCZki008341; Wed, 6 Feb 2013 12:12:35 GMT Received: by mudshark.cambridge.arm.com (Postfix, from userid 1000) id D374FC2A9D; Wed, 6 Feb 2013 12:12:33 +0000 (GMT) From: Will Deacon To: penberg@kernel.org Cc: kvm@vger.kernel.org, Will Deacon Subject: [PATCH] kvm tools: arm: fix GIC #defines to match latest kvm code Date: Wed, 6 Feb 2013 12:12:32 +0000 Message-Id: <1360152752-30044-1-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 1.8.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org During the review process for the KVM ARM patches, the GIC device registration was subjected to some minor renaming, so update kvm tool appropriately. Signed-off-by: Will Deacon --- tools/kvm/arm/gic.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/kvm/arm/gic.c b/tools/kvm/arm/gic.c index 3f42c3a..8d2ff87 100644 --- a/tools/kvm/arm/gic.c +++ b/tools/kvm/arm/gic.c @@ -22,15 +22,15 @@ int gic__alloc_irqnum(void) int gic__init_irqchip(struct kvm *kvm) { int err; - struct kvm_device_address gic_addr[] = { + struct kvm_arm_device_addr gic_addr[] = { [0] = { - .id = (KVM_ARM_DEVICE_VGIC_V2 << KVM_DEVICE_ID_SHIFT) |\ - KVM_VGIC_V2_ADDR_TYPE_DIST, + .id = KVM_VGIC_V2_ADDR_TYPE_DIST | + (KVM_ARM_DEVICE_VGIC_V2 << KVM_ARM_DEVICE_ID_SHIFT), .addr = ARM_GIC_DIST_BASE, }, [1] = { - .id = (KVM_ARM_DEVICE_VGIC_V2 << KVM_DEVICE_ID_SHIFT) |\ - KVM_VGIC_V2_ADDR_TYPE_CPU, + .id = KVM_VGIC_V2_ADDR_TYPE_CPU | + (KVM_ARM_DEVICE_VGIC_V2 << KVM_ARM_DEVICE_ID_SHIFT), .addr = ARM_GIC_CPUI_BASE, } }; @@ -45,11 +45,11 @@ int gic__init_irqchip(struct kvm *kvm) if (err) return err; - err = ioctl(kvm->vm_fd, KVM_SET_DEVICE_ADDRESS, &gic_addr[0]); + err = ioctl(kvm->vm_fd, KVM_ARM_SET_DEVICE_ADDR, &gic_addr[0]); if (err) return err; - err = ioctl(kvm->vm_fd, KVM_SET_DEVICE_ADDRESS, &gic_addr[1]); + err = ioctl(kvm->vm_fd, KVM_ARM_SET_DEVICE_ADDR, &gic_addr[1]); return err; }