Commit 6a834754 authored by David Woodhouse's avatar David Woodhouse Committed by Paolo Bonzini
Browse files

KVM: x86/xen: Use sizeof_field() instead of open-coding it 



Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Message-Id: <20211115165030.7422-4-dwmw2@infradead.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 297d597a

arch/x86/kvm/xen.c

+9 −9
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ void kvm_xen_update_runstate_guest(struct kvm_vcpu *v, int state) 
	state_entry_time = vx->runstate_entry_time;

	state_entry_time |= XEN_RUNSTATE_UPDATE;



	BUILD_BUG_ON(sizeof(((struct vcpu_runstate_info *)0)->state_entry_time) !=

	BUILD_BUG_ON(sizeof_field(struct vcpu_runstate_info, state_entry_time) !=

		     sizeof(state_entry_time));

	BUILD_BUG_ON(sizeof(((struct compat_vcpu_runstate_info *)0)->state_entry_time) !=

	BUILD_BUG_ON(sizeof_field(struct compat_vcpu_runstate_info, state_entry_time) !=

		     sizeof(state_entry_time));



	if (kvm_write_guest_offset_cached(v->kvm, &v->arch.xen.runstate_cache,
@@ -144,9 +144,9 @@ void kvm_xen_update_runstate_guest(struct kvm_vcpu *v, int state) 
	 */

	BUILD_BUG_ON(offsetof(struct vcpu_runstate_info, state) !=

		     offsetof(struct compat_vcpu_runstate_info, state));

	BUILD_BUG_ON(sizeof(((struct vcpu_runstate_info *)0)->state) !=

	BUILD_BUG_ON(sizeof_field(struct vcpu_runstate_info, state) !=

		     sizeof(vx->current_runstate));

	BUILD_BUG_ON(sizeof(((struct compat_vcpu_runstate_info *)0)->state) !=

	BUILD_BUG_ON(sizeof_field(struct compat_vcpu_runstate_info, state) !=

		     sizeof(vx->current_runstate));



	if (kvm_write_guest_offset_cached(v->kvm, &v->arch.xen.runstate_cache,
@@ -163,9 +163,9 @@ void kvm_xen_update_runstate_guest(struct kvm_vcpu *v, int state) 
		     offsetof(struct vcpu_runstate_info, time) - sizeof(u64));

	BUILD_BUG_ON(offsetof(struct compat_vcpu_runstate_info, state_entry_time) !=

		     offsetof(struct compat_vcpu_runstate_info, time) - sizeof(u64));

	BUILD_BUG_ON(sizeof(((struct vcpu_runstate_info *)0)->time) !=

		     sizeof(((struct compat_vcpu_runstate_info *)0)->time));

	BUILD_BUG_ON(sizeof(((struct vcpu_runstate_info *)0)->time) !=

	BUILD_BUG_ON(sizeof_field(struct vcpu_runstate_info, time) !=

		     sizeof_field(struct compat_vcpu_runstate_info, time));

	BUILD_BUG_ON(sizeof_field(struct vcpu_runstate_info, time) !=

		     sizeof(vx->runstate_times));



	if (kvm_write_guest_offset_cached(v->kvm, &v->arch.xen.runstate_cache,
@@ -204,9 +204,9 @@ int __kvm_xen_has_interrupt(struct kvm_vcpu *v) 
	BUILD_BUG_ON(offsetof(struct vcpu_info, evtchn_upcall_pending) !=

		     offsetof(struct compat_vcpu_info, evtchn_upcall_pending));

	BUILD_BUG_ON(sizeof(rc) !=

		     sizeof(((struct vcpu_info *)0)->evtchn_upcall_pending));

		     sizeof_field(struct vcpu_info, evtchn_upcall_pending));

	BUILD_BUG_ON(sizeof(rc) !=

		     sizeof(((struct compat_vcpu_info *)0)->evtchn_upcall_pending));

		     sizeof_field(struct compat_vcpu_info, evtchn_upcall_pending));



	/*

	 * For efficiency, this mirrors the checks for using the valid