clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-06-16 02:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm tools: arm: fix GIC #defines to match latest kvm code

Browse Source 
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 <will.deacon@arm.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Will Deacon
2013-02-06 12:12:32 +00:00
parent bf4bc9021e
commit aa7a0e7915
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arm/gic.c
+7 -7
View File
@@ -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;
}