[xen staging] x86/HVM: correct cleanup after failed viridian_vcpu_init()

[patchbot@xxxxxxx]

commit 66675056c6e59b8a8b651a29ef53c63e9e04f58d
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Oct 18 14:21:17 2021 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Oct 18 14:21:17 2021 +0200

    x86/HVM: correct cleanup after failed viridian_vcpu_init()
    
    This happens after nestedhvm_vcpu_initialise(), so its effects also need
    to be undone.
    
    Fixes: 40a4a9d72d16 ("viridian: add init hooks")
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Release-Acked-by: Ian Jackson <iwj@xxxxxxxxxxxxxx>
---
 xen/arch/x86/hvm/hvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index aa418a3ca1..3a6fd865d9 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -1583,7 +1583,7 @@ int hvm_vcpu_initialise(struct vcpu *v)
 
     rc = viridian_vcpu_init(v);
     if ( rc )
-        goto fail5;
+        goto fail6;
 
     rc = ioreq_server_add_vcpu_all(d, v);
     if ( rc != 0 )
--
generated by git-patchbot for /home/xen/git/xen.git#staging