From 19a1c8529b6bcee56db5c8a5729bff2c8eb10fc8 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 12 Mar 2019 18:11:35 +0000
Subject: [PATCH] SVM: fix build after "make nested page-fault tracing and
 logging consistent"

Some compiler versions don't recognize that "mfn" can't really be used
uninitialized in svm_do_nested_pgfault(). To be on the safe side, add an
initializer for p2mt as well.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
 xen/arch/x86/hvm/svm/svm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index fec9be3ae0..506258abdc 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -1762,8 +1762,8 @@ static void svm_do_nested_pgfault(struct vcpu *v,
 {
     int ret;
     unsigned long gfn = gpa >> PAGE_SHIFT;
-    mfn_t mfn;
-    p2m_type_t p2mt;
+    mfn_t mfn = INVALID_MFN;
+    p2m_type_t p2mt = p2m_invalid;
     p2m_access_t p2ma;
     struct p2m_domain *p2m = NULL;
 
-- 
2.39.5