Commit 19d09149 authored by David Matlack's avatar David Matlack Committed by Sean Christopherson
Browse files

KVM: selftests: Use u16 instead of uint16_t 



Use u16 instead of uint16_t to make the KVM selftests code more concise
and more similar to the kernel (since selftests are primarily developed
by kernel developers).

This commit was generated with the following command:

  git ls-files tools/testing/selftests/kvm | xargs sed -i 's/uint16_t/u16/g'

Then by manually adjusting whitespace to make checkpatch.pl happy.

No functional change intended.

Signed-off-by: default avatarDavid Matlack <dmatlack@google.com>
Link: https://patch.msgid.link/20260420212004.3938325-9-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 7b609187

tools/testing/selftests/kvm/arm64/page_fault_test.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static void guest_at(void) 
 */

static void guest_dc_zva(void)

{

	uint16_t val;

	u16 val;



	asm volatile("dc zva, %0" :: "r" (guest_test_memory));

	dsb(ish);

tools/testing/selftests/kvm/include/kvm_util.h

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ struct vm_shape { 
	u32 type;

	uint8_t  mode;

	uint8_t  pad0;

	uint16_t pad1;

	u16 pad1;

};



kvm_static_assert(sizeof(struct vm_shape) == sizeof(u64));

tools/testing/selftests/kvm/include/x86/evmcs.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include "hyperv.h"

#include "vmx.h"



#define u16 uint16_t

#define u16 u16

#define u32 u32

#define u64 u64

tools/testing/selftests/kvm/include/x86/processor.h

+29 −29
Original line number Diff line number Diff line
@@ -399,8 +399,8 @@ struct gpr64_regs { 
};



struct desc64 {

	uint16_t limit0;

	uint16_t base0;

	u16 limit0;

	u16 base0;

	unsigned base1:8, type:4, s:1, dpl:2, p:1;

	unsigned limit1:4, avl:1, l:1, db:1, g:1, base2:8;

	u32 base3;
@@ -408,7 +408,7 @@ struct desc64 { 
} __attribute__((packed));



struct desc_ptr {

	uint16_t size;

	u16 size;

	u64 address;

} __attribute__((packed));
@@ -476,9 +476,9 @@ static inline void wrmsr(u32 msr, u64 value) 
}





static inline uint16_t inw(uint16_t port)

static inline u16 inw(u16 port)

{

	uint16_t tmp;

	u16 tmp;



	__asm__ __volatile__("in %%dx, %%ax"

		: /* output */ "=a" (tmp)
@@ -487,63 +487,63 @@ static inline uint16_t inw(uint16_t port) 
	return tmp;

}



static inline uint16_t get_es(void)

static inline u16 get_es(void)

{

	uint16_t es;

	u16 es;



	__asm__ __volatile__("mov %%es, %[es]"

			     : /* output */ [es]"=rm"(es));

	return es;

}



static inline uint16_t get_cs(void)

static inline u16 get_cs(void)

{

	uint16_t cs;

	u16 cs;



	__asm__ __volatile__("mov %%cs, %[cs]"

			     : /* output */ [cs]"=rm"(cs));

	return cs;

}



static inline uint16_t get_ss(void)

static inline u16 get_ss(void)

{

	uint16_t ss;

	u16 ss;



	__asm__ __volatile__("mov %%ss, %[ss]"

			     : /* output */ [ss]"=rm"(ss));

	return ss;

}



static inline uint16_t get_ds(void)

static inline u16 get_ds(void)

{

	uint16_t ds;

	u16 ds;



	__asm__ __volatile__("mov %%ds, %[ds]"

			     : /* output */ [ds]"=rm"(ds));

	return ds;

}



static inline uint16_t get_fs(void)

static inline u16 get_fs(void)

{

	uint16_t fs;

	u16 fs;



	__asm__ __volatile__("mov %%fs, %[fs]"

			     : /* output */ [fs]"=rm"(fs));

	return fs;

}



static inline uint16_t get_gs(void)

static inline u16 get_gs(void)

{

	uint16_t gs;

	u16 gs;



	__asm__ __volatile__("mov %%gs, %[gs]"

			     : /* output */ [gs]"=rm"(gs));

	return gs;

}



static inline uint16_t get_tr(void)

static inline u16 get_tr(void)

{

	uint16_t tr;

	u16 tr;



	__asm__ __volatile__("str %[tr]"

			     : /* output */ [tr]"=rm"(tr));
@@ -651,7 +651,7 @@ static inline struct desc_ptr get_idt(void) 
	return idt;

}



static inline void outl(uint16_t port, u32 value)

static inline void outl(u16 port, u32 value)

{

	__asm__ __volatile__("outl %%eax, %%dx" : : "d"(port), "a"(value));

}
@@ -1194,15 +1194,15 @@ struct ex_regs { 
};



struct idt_entry {

	uint16_t offset0;

	uint16_t selector;

	uint16_t ist : 3;

	uint16_t : 5;

	uint16_t type : 4;

	uint16_t : 1;

	uint16_t dpl : 2;

	uint16_t p : 1;

	uint16_t offset1;

	u16 offset0;

	u16 selector;

	u16 ist : 3;

	u16 : 5;

	u16 type : 4;

	u16 : 1;

	u16 dpl : 2;

	u16 p : 1;

	u16 offset1;

	u32 offset2; u32 reserved;

};

tools/testing/selftests/kvm/lib/guest_sprintf.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ int guest_vsnprintf(char *buf, int n, const char *fmt, va_list args) 
		if (qualifier == 'l')

			num = va_arg(args, u64);

		else if (qualifier == 'h') {

			num = (uint16_t)va_arg(args, int);

			num = (u16)va_arg(args, int);

			if (flags & SIGN)

				num = (int16_t)num;

		} else if (flags & SIGN)