diff options
author | Christoffer Dall <christoffer.dall@linaro.org> | 2014-12-09 08:28:09 -0500 |
---|---|---|
committer | Christoffer Dall <christoffer.dall@linaro.org> | 2014-12-13 08:17:05 -0500 |
commit | c52edf5f8caff878afc93c1b1e9a3d9490a9932f (patch) | |
tree | 839b74bd118672950321f2d8cd8e6c7d90dbb80e /virt | |
parent | 6d3cfbe21bef5b66530b50ad16c88fdc71a04c35 (diff) |
arm/arm64: KVM: Rename vgic_initialized to vgic_ready
The vgic_initialized() macro currently returns the state of the
vgic->ready flag, which indicates if the vgic is ready to be used when
running a VM, not specifically if its internal state has been
initialized.
Rename the macro accordingly in preparation for a more nuanced
initialization flow.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: Eric Auger <eric.auger@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/arm/vgic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index 1ce4e364c1e0..4edb2572ea9a 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c | |||
@@ -1696,7 +1696,7 @@ int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int irq_num, | |||
1696 | { | 1696 | { |
1697 | int vcpu_id; | 1697 | int vcpu_id; |
1698 | 1698 | ||
1699 | if (likely(vgic_initialized(kvm))) { | 1699 | if (likely(vgic_ready(kvm))) { |
1700 | vcpu_id = vgic_update_irq_pending(kvm, cpuid, irq_num, level); | 1700 | vcpu_id = vgic_update_irq_pending(kvm, cpuid, irq_num, level); |
1701 | if (vcpu_id >= 0) | 1701 | if (vcpu_id >= 0) |
1702 | /* kick the specified vcpu */ | 1702 | /* kick the specified vcpu */ |
@@ -1888,7 +1888,7 @@ int kvm_vgic_map_resources(struct kvm *kvm) | |||
1888 | 1888 | ||
1889 | mutex_lock(&kvm->lock); | 1889 | mutex_lock(&kvm->lock); |
1890 | 1890 | ||
1891 | if (vgic_initialized(kvm)) | 1891 | if (vgic_ready(kvm)) |
1892 | goto out; | 1892 | goto out; |
1893 | 1893 | ||
1894 | if (IS_VGIC_ADDR_UNDEF(kvm->arch.vgic.vgic_dist_base) || | 1894 | if (IS_VGIC_ADDR_UNDEF(kvm->arch.vgic.vgic_dist_base) || |
@@ -2282,7 +2282,7 @@ static int vgic_set_attr(struct kvm_device *dev, struct kvm_device_attr *attr) | |||
2282 | 2282 | ||
2283 | mutex_lock(&dev->kvm->lock); | 2283 | mutex_lock(&dev->kvm->lock); |
2284 | 2284 | ||
2285 | if (vgic_initialized(dev->kvm) || dev->kvm->arch.vgic.nr_irqs) | 2285 | if (vgic_ready(dev->kvm) || dev->kvm->arch.vgic.nr_irqs) |
2286 | ret = -EBUSY; | 2286 | ret = -EBUSY; |
2287 | else | 2287 | else |
2288 | dev->kvm->arch.vgic.nr_irqs = val; | 2288 | dev->kvm->arch.vgic.nr_irqs = val; |