[PATCH 1/2] x86/svm: Fix indentation in svm_vmcb_restore()

[PATCH 1/2] x86/svm: Fix indentation in svm_vmcb_restore()

[Andrew Cooper]

Inroduced by c/s b706e1c6af274, spotted by Coverity.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Boris Ostrovsky <boris.ostrovsky@oracle.com>
CC: Suravee Suthikulpanit <suravee.suthikulpanit@amd.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 a088fd7..1f8aca6 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -271,8 +271,8 @@ static int svm_vmcb_restore(struct vcpu *v, struct hvm_hw_cpu *c)
 
     if ( c->pending_valid )
     {
-       if ( (c->pending_type == 1) || (c->pending_type > 6) ||
-            (c->pending_reserved != 0) )
+        if ( (c->pending_type == 1) || (c->pending_type > 6) ||
+             (c->pending_reserved != 0) )
         {
             dprintk(XENLOG_ERR, "%pv: Invalid pending event %#"PRIx32"\n",
                     v, c->pending_event);
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[PATCH 2/2] x86/svm: Correct event injection check in svm_vmcb_restore()

[Andrew Cooper]

SVM's maximum valid event type is 4.  This appears to be a straigth copy and
paste error in c/s e94e3f210a62, as VT-x's maximum is 6.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Boris Ostrovsky <boris.ostrovsky@oracle.com>
CC: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
---
 xen/arch/x86/hvm/svm/svm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index 1f8aca6..531c64f 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -271,7 +271,7 @@ static int svm_vmcb_restore(struct vcpu *v, struct hvm_hw_cpu *c)
 
     if ( c->pending_valid )
     {
-        if ( (c->pending_type == 1) || (c->pending_type > 6) ||
+        if ( (c->pending_type == 1) || (c->pending_type > 4) ||
              (c->pending_reserved != 0) )
         {
             dprintk(XENLOG_ERR, "%pv: Invalid pending event %#"PRIx32"\n",
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH 2/2] x86/svm: Correct event injection check in svm_vmcb_restore()

[Boris Ostrovsky]

On 04/07/2017 11:50 AM, Andrew Cooper wrote:
> SVM's maximum valid event type is 4.  This appears to be a straigth copy and
> paste error in c/s e94e3f210a62, as VT-x's maximum is 6.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> ---
> CC: Jan Beulich <JBeulich@suse.com>
> CC: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> CC: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
> ---

I was just about to send this exact patch ;-)

Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [PATCH 1/2] x86/svm: Fix indentation in svm_vmcb_restore()

[Jan Beulich]

>>> On 07.04.17 at 17:50, <andrew.cooper3@citrix.com> wrote:
> Inroduced by c/s b706e1c6af274, spotted by Coverity.

Oops, I'm sorry. This is the kind of change which I would generally
think ought to be fine to go in without any acks.

Jan

> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> ---
> CC: Jan Beulich <JBeulich@suse.com>
> CC: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> CC: Suravee Suthikulpanit <suravee.suthikulpanit@amd.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 a088fd7..1f8aca6 100644
> --- a/xen/arch/x86/hvm/svm/svm.c
> +++ b/xen/arch/x86/hvm/svm/svm.c
> @@ -271,8 +271,8 @@ static int svm_vmcb_restore(struct vcpu *v, struct hvm_hw_cpu *c)
>  
>      if ( c->pending_valid )
>      {
> -       if ( (c->pending_type == 1) || (c->pending_type > 6) ||
> -            (c->pending_reserved != 0) )
> +        if ( (c->pending_type == 1) || (c->pending_type > 6) ||
> +             (c->pending_reserved != 0) )
>          {
>              dprintk(XENLOG_ERR, "%pv: Invalid pending event %#"PRIx32"\n",
>                      v, c->pending_event);
> -- 
> 2.1.4




_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel