[xen staging] x86/shadow: make a local variable in sh_page_fault() HVM-only

[patchbot@xxxxxxx]

commit c8ac573c238308dbaa31fa6acb571c91b587714f
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Oct 18 14:22:32 2021 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Oct 18 14:22:32 2021 +0200

    x86/shadow: make a local variable in sh_page_fault() HVM-only
    
    I recall checking that "r" would still have a user, but when doing so I
    failed to recognize that all uses are inside a CONFIG_HVM conditional
    section.
    
    Fixes: 9f4f20b27b07 ("x86/shadow: adjust some shadow_set_l<N>e() callers")
    Reported-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/mm/shadow/multi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
index a3ce4b6259..7b8f4dd13b 100644
--- a/xen/arch/x86/mm/shadow/multi.c
+++ b/xen/arch/x86/mm/shadow/multi.c
@@ -2155,8 +2155,8 @@ static int sh_page_fault(struct vcpu *v,
 #ifdef CONFIG_HVM
     struct sh_emulate_ctxt emul_ctxt;
     const struct x86_emulate_ops *emul_ops;
-#endif
     int r;
+#endif
     p2m_type_t p2mt;
     uint32_t rc, error_code;
     bool walk_ok;
--
generated by git-patchbot for /home/xen/git/xen.git#staging