From a162dd58736d446f52ca45b170508c3a5868807b Mon Sep 17 00:00:00 2001 From: Jerone Young Date: Mon, 19 Nov 2007 17:06:37 -0600 Subject: [PATCH] KVM: Portability: Move cpuid structures to This patch moves structures: kvm_cpuid_entry kvm_cpuid from include/linux/kvm.h to include/asm-x86/kvm.h Signed-off-by: Jerone Young Signed-off-by: Avi Kivity --- include/asm-x86/kvm.h | 17 +++++++++++++++++ include/linux/kvm.h | 16 ---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/include/asm-x86/kvm.h b/include/asm-x86/kvm.h index 32c7dda61474..4837d759bec0 100644 --- a/include/asm-x86/kvm.h +++ b/include/asm-x86/kvm.h @@ -135,4 +135,21 @@ struct kvm_msr_list { }; +struct kvm_cpuid_entry { + __u32 function; + __u32 eax; + __u32 ebx; + __u32 ecx; + __u32 edx; + __u32 padding; +}; + +/* for KVM_SET_CPUID */ +struct kvm_cpuid { + __u32 nent; + __u32 padding; + struct kvm_cpuid_entry entries[0]; +}; + + #endif diff --git a/include/linux/kvm.h b/include/linux/kvm.h index e6867aa6daf6..fd4f900fcce3 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -192,22 +192,6 @@ struct kvm_dirty_log { }; }; -struct kvm_cpuid_entry { - __u32 function; - __u32 eax; - __u32 ebx; - __u32 ecx; - __u32 edx; - __u32 padding; -}; - -/* for KVM_SET_CPUID */ -struct kvm_cpuid { - __u32 nent; - __u32 padding; - struct kvm_cpuid_entry entries[0]; -}; - /* for KVM_SET_SIGNAL_MASK */ struct kvm_signal_mask { __u32 len; -- 2.20.1