diff options
| author | max <max@bh1-build.(none)> | 2011-04-05 05:54:01 -0700 |
|---|---|---|
| committer | Max Bruning <max@joyent.com> | 2011-04-05 10:48:09 -0700 |
| commit | e3336b9a47ec73b4aa384186c10ae251aa2db081 (patch) | |
| tree | 513be68038ea5a03762e695fc0311b962695eadf | |
| parent | e8483c9ff70595dc7d4ba5b54851f56e376996ce (diff) | |
| download | illumos-kvm-e3336b9a47ec73b4aa384186c10ae251aa2db081.tar.gz | |
remove inline keywords
| -rw-r--r-- | kvm.c | 7 | ||||
| -rw-r--r-- | kvm_para.h | 7 | ||||
| -rw-r--r-- | kvm_x86host.h | 1 |
3 files changed, 8 insertions, 7 deletions
@@ -35,6 +35,7 @@ #include "tss.h" #include "ioapic.h" #include "coalesced_mmio.h" +#include "hyperv.h" int kvmid; /* monotonically increasing, unique per vm */ @@ -9869,12 +9870,6 @@ void __init kvm_guest_init(void); #define kvm_guest_init() do { } while (0) #endif -static int kvm_para_has_feature(unsigned int feature) -{ - if (kvm_arch_para_features() & (1UL << feature)) - return 1; - return 0; -} #endif /* _KERNEL */ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu) @@ -29,7 +29,12 @@ void __init kvm_guest_init(void); #define kvm_guest_init() do { } while (0) #endif -static inline int kvm_para_has_feature(unsigned int feature) +static unsigned int kvm_arch_para_features(void) +{ + return cpuid_eax(KVM_CPUID_FEATURES); +} + +static int kvm_para_has_feature(unsigned int feature) { if (kvm_arch_para_features() & (1UL << feature)) return 1; diff --git a/kvm_x86host.h b/kvm_x86host.h index 23d040b..4f74dc8 100644 --- a/kvm_x86host.h +++ b/kvm_x86host.h @@ -29,6 +29,7 @@ #endif #include "kvm_types.h" +#include "msr.h" #define KVM_PIO_PAGE_OFFSET 0 #define KVM_COALESCED_MMIO_PAGE_OFFSET 0 |