Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / include / linux / kvm_host.h

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 4d629471869bbd3ea9ad2ce512dbf3f985fff4ab..8c0664309815ff95b0308b379e863125866f31f6 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -384,8 +384,6 @@ struct kvm {
        struct mutex slots_lock;
        struct mm_struct *mm; /* userspace tied to this vm */
        struct kvm_memslots *memslots[KVM_ADDRESS_SPACE_NUM];
-       struct srcu_struct srcu;
-       struct srcu_struct irq_srcu;
        struct kvm_vcpu *vcpus[KVM_MAX_VCPUS];
 
        /*
@@ -438,6 +436,8 @@ struct kvm {
        struct list_head devices;
        struct dentry *debugfs_dentry;
        struct kvm_stat_data **debugfs_stat_data;
+       struct srcu_struct srcu;
+       struct srcu_struct irq_srcu;
 };
 
 #define kvm_err(fmt, ...) \
@@ -499,6 +499,17 @@ static inline struct kvm_vcpu *kvm_get_vcpu_by_id(struct kvm *kvm, int id)
        return NULL;
 }
 
+static inline int kvm_vcpu_get_idx(struct kvm_vcpu *vcpu)
+{
+       struct kvm_vcpu *tmp;
+       int idx;
+
+       kvm_for_each_vcpu(idx, tmp, vcpu->kvm)
+               if (tmp == vcpu)
+                       return idx;
+       BUG();
+}
+
 #define kvm_for_each_memslot(memslot, slots)   \
        for (memslot = &slots->memslots[0];     \
              memslot < slots->memslots + KVM_MEM_SLOTS_NUM && memslot->npages;\
@@ -1167,7 +1178,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type);
 void kvm_unregister_device_ops(u32 type);
 
 extern struct kvm_device_ops kvm_mpic_ops;
-extern struct kvm_device_ops kvm_xics_ops;
 extern struct kvm_device_ops kvm_arm_vgic_v2_ops;
 extern struct kvm_device_ops kvm_arm_vgic_v3_ops;