Commit c1a527a1 authored by Like Xu's avatar Like Xu Committed by Paolo Bonzini
Browse files

KVM: x86: Clean up redundant ROL16(val, n) macro definition 



The ROL16(val, n) macro is repeatedly defined in several vmcs-related
files, and it has never been used outside the KVM context.

Let's move it to vmcs.h without any intended functional changes.

Signed-off-by: default avatarLike Xu <likexu@tencent.com>
Message-Id: <20210809093410.59304-4-likexu@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 65297341

arch/x86/kvm/vmx/evmcs.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ DEFINE_STATIC_KEY_FALSE(enable_evmcs); 


#if IS_ENABLED(CONFIG_HYPERV)



#define ROL16(val, n) ((u16)(((u16)(val) << (n)) | ((u16)(val) >> (16 - (n)))))

#define EVMCS1_OFFSET(x) offsetof(struct hv_enlightened_vmcs, x)

#define EVMCS1_FIELD(number, name, clean_field)[ROL16(number, 6)] = \

		{EVMCS1_OFFSET(name), clean_field}

arch/x86/kvm/vmx/evmcs.h

+0 −4
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ struct evmcs_field { 
extern const struct evmcs_field vmcs_field_to_evmcs_1[];

extern const unsigned int nr_evmcs_1_fields;



#define ROL16(val, n) ((u16)(((u16)(val) << (n)) | ((u16)(val) >> (16 - (n)))))



static __always_inline int get_evmcs_offset(unsigned long field,

					    u16 *clean_field)

{
@@ -95,8 +93,6 @@ static __always_inline int get_evmcs_offset(unsigned long field, 
	return evmcs_field->offset;

}



#undef ROL16



static inline void evmcs_write64(unsigned long field, u64 value)

{

	u16 clean_field;

arch/x86/kvm/vmx/vmcs.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 


#include "capabilities.h"



#define ROL16(val, n) ((u16)(((u16)(val) << (n)) | ((u16)(val) >> (16 - (n)))))



struct vmcs_hdr {

	u32 revision_id:31;

	u32 shadow_vmcs:1;

arch/x86/kvm/vmx/vmcs12.c

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


#include "vmcs12.h"



#define ROL16(val, n) ((u16)(((u16)(val) << (n)) | ((u16)(val) >> (16 - (n)))))

#define VMCS12_OFFSET(x) offsetof(struct vmcs12, x)

#define FIELD(number, name)	[ROL16(number, 6)] = VMCS12_OFFSET(name)

#define FIELD64(number, name)						\

arch/x86/kvm/vmx/vmcs12.h

+0 −4
Original line number Diff line number Diff line
@@ -364,8 +364,6 @@ static inline void vmx_check_vmcs12_offsets(void) 
extern const unsigned short vmcs_field_to_offset_table[];

extern const unsigned int nr_vmcs12_fields;



#define ROL16(val, n) ((u16)(((u16)(val) << (n)) | ((u16)(val) >> (16 - (n)))))



static inline short vmcs_field_to_offset(unsigned long field)

{

	unsigned short offset;
@@ -385,8 +383,6 @@ static inline short vmcs_field_to_offset(unsigned long field) 
	return offset;

}



#undef ROL16



static inline u64 vmcs12_read_any(struct vmcs12 *vmcs12, unsigned long field,

				  u16 offset)

{