diff options
author | Robert Mustacchi <rm@joyent.com> | 2011-07-01 14:08:56 -0700 |
---|---|---|
committer | Robert Mustacchi <rm@joyent.com> | 2011-07-01 14:08:56 -0700 |
commit | 33afe2f37503804996aaf48f846030094d9b851b (patch) | |
tree | 9b3c190af1dfcba6ef7ce62e01e93c683f49cc54 | |
parent | 553ff6315302ca952e9e6b7db8a4e58342b9d618 (diff) | |
download | illumos-kvm-33afe2f37503804996aaf48f846030094d9b851b.tar.gz |
HVM-462 kvm_x86impl.h should be cstyle clean
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | kvm_x86impl.h | 43 |
2 files changed, 23 insertions, 23 deletions
@@ -39,7 +39,8 @@ HEADERS= \ kvm_types.h \ kvm_vmx.h \ kvm_x86.h \ - kvm_x86host.h + kvm_x86host.h \ + kvm_x86impl.h kvm: kvm.c kvm_x86.c kvm_emulate.c kvm.h kvm_x86host.h msr.h kvm_bitops.h kvm_irq.c kvm_i8254.c kvm_lapic.c kvm_mmu.c kvm_iodev.c kvm_ioapic.c kvm_vmx.c kvm_i8259.c kvm_coalesced_mmio.c kvm_irq_comm.c kvm_cache_regs.c kvm_bitops.c $(HEADERS) $(CC) $(CFLAGS) $(INCLUDEDIR) kvm.c diff --git a/kvm_x86impl.h b/kvm_x86impl.h index 2f156f6..951e63d 100644 --- a/kvm_x86impl.h +++ b/kvm_x86impl.h @@ -12,31 +12,30 @@ #include "kvm_x86.h" #include "kvm_cache_regs.h" -inline void kvm_clear_exception_queue(struct kvm_vcpu *); -inline void kvm_queue_interrupt(struct kvm_vcpu *vcpu, uint8_t vector, - int soft); -inline void kvm_clear_interrupt_queue(struct kvm_vcpu *vcpu); -inline int kvm_event_needs_reinjection(struct kvm_vcpu *vcpu); -inline int kvm_exception_is_soft(unsigned int nr); -kvm_cpuid_entry2_t *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu, - uint32_t function, uint32_t index); -inline int is_protmode(struct kvm_vcpu *vcpu); -inline int is_long_mode(struct kvm_vcpu *vcpu); -inline int is_pae(struct kvm_vcpu *vcpu); -inline int is_pse(struct kvm_vcpu *vcpu); -inline int is_paging(struct kvm_vcpu *vcpu); - -caddr_t page_address(page_t *page); +extern inline void kvm_clear_exception_queue(struct kvm_vcpu *); +extern inline void kvm_queue_interrupt(struct kvm_vcpu *, uint8_t, int); +extern inline void kvm_clear_interrupt_queue(struct kvm_vcpu *); +extern inline int kvm_event_needs_reinjection(struct kvm_vcpu *); +extern inline int kvm_exception_is_soft(unsigned int nr); +extern kvm_cpuid_entry2_t *kvm_find_cpuid_entry(struct kvm_vcpu *, + uint32_t, uint32_t); +extern inline int is_protmode(struct kvm_vcpu *); +extern inline int is_long_mode(struct kvm_vcpu *); +extern inline int is_pae(struct kvm_vcpu *); +extern inline int is_pse(struct kvm_vcpu *); +extern inline int is_paging(struct kvm_vcpu *); + +extern caddr_t page_address(page_t *); extern page_t *alloc_page(int, void **); -extern uint64_t kvm_va2pa(caddr_t va); +extern uint64_t kvm_va2pa(caddr_t); extern page_t *pfn_to_page(pfn_t); extern int zero_constructor(void *, void *, int); -#define KVM_CPUALL -1 +#define KVM_CPUALL -1 typedef void (*kvm_xcall_t)(void *); -extern void kvm_xcall(processorid_t cpu, kvm_xcall_t func, void *arg); -extern int kvm_xcall_func(kvm_xcall_t func, void *arg); +extern void kvm_xcall(processorid_t, kvm_xcall_t, void *); +extern int kvm_xcall_func(kvm_xcall_t, void *); unsigned long native_read_cr0(void); #define read_cr0() (native_read_cr0()) @@ -45,9 +44,9 @@ unsigned long native_read_cr4(void); unsigned long native_read_cr3(void); #define read_cr3() (native_read_cr3()) -inline page_t *compound_head(page_t *page); -inline void get_page(page_t *page); -inline unsigned long get_desc_limit(const struct desc_struct *desc); +inline page_t *compound_head(page_t *); +inline void get_page(page_t *); +inline unsigned long get_desc_limit(const struct desc_struct *); extern unsigned long get_desc_base(const struct desc_struct *); uint32_t bit(int); |