From: Sergey Dyasli <sergey.dyasli@citrix.com>
Date: Wed, 14 Nov 2018 10:23:16 +0000 (+0000)
Subject: x86/nestedhvm: init nv_vvmcxaddr in hvm_vcpu_initialise()
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~2962
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=51c475f4b8ebfae4c9323c53b5d9c5ebf3000091;p=xen.git

x86/nestedhvm: init nv_vvmcxaddr in hvm_vcpu_initialise()

This allows to safely use nestedhvm functions that rely on the values
inside struct nestedvcpu independently of the nested virtualisation
(HVM_PARAM_NESTEDHVM) status of a domain.

Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Sergey Dyasli <sergey.dyasli@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 5d263c4090..c0a3db5858 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -1516,6 +1516,8 @@ int hvm_vcpu_initialise(struct vcpu *v)
     if ( rc != 0 )
         goto fail4;
 
+    vcpu_nestedhvm(v).nv_vvmcxaddr = INVALID_PADDR;
+
     if ( nestedhvm_enabled(d)
          && (rc = nestedhvm_vcpu_initialise(v)) < 0 ) /* teardown: nestedhvm_vcpu_destroy */
         goto fail5;