Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[platform/kernel/linux-rpi.git] / include / linux / kvm_host.h

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 4640393..c20f2d5 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -614,7 +614,8 @@ struct kvm_hv_sint {
 
 struct kvm_xen_evtchn {
        u32 port;
-       u32 vcpu;
+       u32 vcpu_id;
+       int vcpu_idx;
        u32 priority;
 };
 
@@ -727,6 +728,7 @@ struct kvm {
         * and is accessed atomically.
         */
        atomic_t online_vcpus;
+       int max_vcpus;
        int created_vcpus;
        int last_boosted_vcpu;
        struct list_head vm_list;