HVM-288 kvm.h and kvm_host.h should be similar to upstream in content (lint)

5 files changed, 40 insertions, 30 deletions

diff --git a/kvm.c b/kvm.c
index d3a8025..71579be 100644
--- a/kvm.c
+++ b/kvm.c
@@ -4970,9 +4970,11 @@ get_desc_limit(const struct desc_struct *desc)
 	return (desc->c.b.limit0 | (desc->c.b.limit << 16));
 }
 
-unsigned long get_desc_base(const struct desc_struct *desc)
+unsigned long
+get_desc_base(const struct desc_struct *desc)
 {
-       return (unsigned)(desc->c.b.base0 | ((desc->c.b.base1) << 16) | ((desc->c.b.base2) << 24));
+	return (unsigned)(desc->c.b.base0 | ((desc->c.b.base1) << 16) |
+	    ((desc->c.b.base2) << 24));
 }
 
 
diff --git a/kvm_i8254.c b/kvm_i8254.c
index 99e6007..91ce910 100644
--- a/kvm_i8254.c
+++ b/kvm_i8254.c
@@ -46,12 +46,12 @@
 
 extern int kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu);
 
-#define mod_64(x, y) ((x) % (y))
+#define	mod_64(x, y) ((x) % (y))
 
-#define RW_STATE_LSB 1
-#define RW_STATE_MSB 2
-#define RW_STATE_WORD0 3
-#define RW_STATE_WORD1 4
+#define	RW_STATE_LSB 1
+#define	RW_STATE_MSB 2
+#define	RW_STATE_WORD0 3
+#define	RW_STATE_WORD1 4
 
 static uint64_t
 muldiv64(uint64_t a, uint32_t b, uint32_t c)
diff --git a/kvm_lapic.c b/kvm_lapic.c
index 3f9b3e9..86710ed 100644
--- a/kvm_lapic.c
+++ b/kvm_lapic.c
@@ -45,18 +45,18 @@ extern unsigned long kvm_rip_read(struct kvm_vcpu *);
 extern struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu,
     uint32_t function, uint32_t index);
 
-#define APIC_BUS_CYCLE_NS 1
+#define	APIC_BUS_CYCLE_NS 1
 #define	APIC_LDR	0xD0
 
-#define APIC_LVT_NUM			6
-/* 14 is the version for Xeon and Pentium 8.4.8*/
-#define APIC_VERSION			(0x14UL | ((APIC_LVT_NUM - 1) << 16))
-#define LAPIC_MMIO_LENGTH		(1 << 12)
+#define	APIC_LVT_NUM			6
+/* 14 is the version for Xeon and Pentium 8.4.8 */
+#define	APIC_VERSION			(0x14UL | ((APIC_LVT_NUM - 1) << 16))
+#define	LAPIC_MMIO_LENGTH		(1 << 12)
 /* followed define is not in apicdef.h */
-#define APIC_SHORT_MASK			0xc0000
-#define APIC_DEST_NOSHORT		0x0
-#define APIC_DEST_MASK			0x800
-#define MAX_APIC_VECTOR			256
+#define	APIC_SHORT_MASK			0xc0000
+#define	APIC_DEST_NOSHORT		0x0
+#define	APIC_DEST_MASK			0x800
+#define	MAX_APIC_VECTOR			256
 
 
 #define	LVT_MASK	\
diff --git a/kvm_subr.c b/kvm_subr.c
index d47dea7..316205a 100644
--- a/kvm_subr.c
+++ b/kvm_subr.c
@@ -223,50 +223,57 @@ is_long_mode(struct kvm_vcpu *vcpu)
 #endif
 }
 
-unsigned short kvm_read_fs(void)
+unsigned short
+kvm_read_fs(void)
 {
 	unsigned short seg;
 	__asm__("mov %%fs, %0" : "=g"(seg));
-	return seg;
+	return (seg);
 }
 
-unsigned short kvm_read_gs(void)
+unsigned short
+kvm_read_gs(void)
 {
 	unsigned short seg;
 	__asm__("mov %%gs, %0" : "=g"(seg));
-	return seg;
+	return (seg);
 }
 
-unsigned short kvm_read_ldt(void)
+unsigned short
+kvm_read_ldt(void)
 {
 	unsigned short ldt;
 	__asm__("sldt %0" : "=g"(ldt));
-	return ldt;
+	return (ldt);
 }
 
-void kvm_load_fs(unsigned short sel)
+void
+kvm_load_fs(unsigned short sel)
 {
 	__asm__("mov %0, %%fs" : : "rm"(sel));
 }
 
-void kvm_load_gs(unsigned short sel)
+void
+kvm_load_gs(unsigned short sel)
 {
 	__asm__("mov %0, %%gs" : : "rm"(sel));
 }
 
-void kvm_load_ldt(unsigned short sel)
+void
+kvm_load_ldt(unsigned short sel)
 {
 	__asm__("lldt %0" : : "rm"(sel));
 }
 
 
-void kvm_get_idt(struct descriptor_table *table)
+void
+kvm_get_idt(struct descriptor_table *table)
 {
 	__asm__("sidt %0" : "=m"(*table));
 }
 
-void kvm_get_gdt(struct descriptor_table *table)
+void
+kvm_get_gdt(struct descriptor_table *table)
 {
 	__asm__("sgdt %0" : "=m"(*table));
 }
-
diff --git a/kvm_vmx.c b/kvm_vmx.c
index 0ce6d8f..82fac4c 100644
--- a/kvm_vmx.c
+++ b/kvm_vmx.c
@@ -329,12 +329,13 @@ static const uint32_t vmx_msr_index[] = {
 
 #define	NR_VMX_MSR ARRAY_SIZE(vmx_msr_index)
 
-static void native_load_tr_desc(void)
+static void
+native_load_tr_desc(void)
 {
 	__asm__ volatile("ltr %w0"::"q" (KTSS_SEL));
 }
 
-#define load_TR_desc() native_load_tr_desc()
+#define	load_TR_desc() native_load_tr_desc()
 
 
 static int