From: Denis Mukhin Date: Sat, 26 Apr 2025 07:27:44 +0000 (+0000) Subject: x86/vmx: Update DR7 type X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=48c9e67594496e1ab030c17b6bc136afe9f48e7f;p=xen.git x86/vmx: Update DR7 type Use the new vmread() accessor and shrink dr7 to it's preferred size. No functional change. Signed-off-by: Denis Mukhin Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper --- diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 4883bd823d..827db6bdd8 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -926,7 +926,7 @@ static void vmx_save_dr(struct vcpu *v) v->arch.dr[3] = read_debugreg(3); v->arch.dr6 = read_debugreg(6); /* DR7 must be saved as it is used by vmx_restore_dr(). */ - __vmread(GUEST_DR7, &v->arch.dr7); + v->arch.dr7 = vmread(GUEST_DR7); } static void __restore_debug_registers(struct vcpu *v) diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/domain.h index 5fc1d1e5d0..8c0dea12a5 100644 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -595,8 +595,8 @@ struct arch_vcpu /* Debug registers. */ unsigned long dr[4]; - unsigned long dr7; /* Ideally int, but __vmread() needs long. */ unsigned int dr6; + unsigned int dr7; /* other state */