From 4f4fc9afc50f1b19bce72e56b364c2d65ec15e7f Mon Sep 17 00:00:00 2001 From: Teddy Astie Date: Tue, 27 Oct 2026 09:00:21 +0100 Subject: [PATCH] x86/nestedhvm: Inline nestedhvm_vcpu_in_guestmode() This function just returns vcpu_nestedhvm(v).nv_guestmode and would be better inlined to improve codegen. Signed-off-by: Teddy Astie Acked-by: Jan Beulich --- xen/arch/x86/hvm/nestedhvm.c | 7 ------- xen/arch/x86/include/asm/hvm/nestedhvm.h | 7 +++++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/hvm/nestedhvm.c b/xen/arch/x86/hvm/nestedhvm.c index bddd77d810..3205277e81 100644 --- a/xen/arch/x86/hvm/nestedhvm.c +++ b/xen/arch/x86/hvm/nestedhvm.c @@ -15,13 +15,6 @@ static unsigned long *shadow_io_bitmap[3]; -/* Nested VCPU */ -bool -nestedhvm_vcpu_in_guestmode(struct vcpu *v) -{ - return vcpu_nestedhvm(v).nv_guestmode; -} - void nestedhvm_vcpu_reset(struct vcpu *v) { diff --git a/xen/arch/x86/include/asm/hvm/nestedhvm.h b/xen/arch/x86/include/asm/hvm/nestedhvm.h index ea2c1bc328..8a2a0fbb3c 100644 --- a/xen/arch/x86/include/asm/hvm/nestedhvm.h +++ b/xen/arch/x86/include/asm/hvm/nestedhvm.h @@ -28,11 +28,14 @@ static inline bool nestedhvm_enabled(const struct domain *d) return IS_ENABLED(CONFIG_HVM) && (d->options & XEN_DOMCTL_CDF_nested_virt); } -/* Nested VCPU */ +static inline bool nestedhvm_vcpu_in_guestmode(const struct vcpu *v) +{ + return vcpu_nestedhvm(v).nv_guestmode; +} + int nestedhvm_vcpu_initialise(struct vcpu *v); void nestedhvm_vcpu_destroy(struct vcpu *v); void nestedhvm_vcpu_reset(struct vcpu *v); -bool nestedhvm_vcpu_in_guestmode(struct vcpu *v); #define nestedhvm_vcpu_enter_guestmode(v) \ vcpu_nestedhvm(v).nv_guestmode = 1 #define nestedhvm_vcpu_exit_guestmode(v) \