[Xen-changelog] [xen stable-4.2] x86/hvm: fix HVMOP_inject_trap return value on success

[patchbot@xxxxxxx]

commit da1aa339c82f30ff9dba9d72bc61f52a443c18f5
Author:     Tim Deegan <tim@xxxxxxx>
AuthorDate: Mon Jul 1 12:00:27 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Jul 1 12:00:27 2013 +0200

    x86/hvm: fix HVMOP_inject_trap return value on success
    
    Reported-by: Antony Saba <Antony.Saba@xxxxxxxxxxxx>
    Signed-off-by: Tim Deegan <tim@xxxxxxx>
    Acked-by: Keir Fraser <keir@xxxxxxx>
    Acked-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
    master commit: a12d15d8c1d512a4ed6498b39f9058f69a1c1f6c
    master date: 2013-06-21 17:01:50 +0200
---
 xen/arch/x86/hvm/hvm.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 130c84b..0740df7 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -4379,6 +4379,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) 
arg)
             v->arch.hvm_vcpu.inject_trap.error_code = tr.error_code;
             v->arch.hvm_vcpu.inject_trap.insn_len = tr.insn_len;
             v->arch.hvm_vcpu.inject_trap.cr2 = tr.cr2;
+            rc = 0;
         }
 
     param_fail8:
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.2

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog