Skip to contentSkip to conversation

x86/vmx: fix compilation after 997382

PATCH In review Roger Pau Monne 2 participants 3 messages Feb 14, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/vmx: fix compilation after 997382

997382 introduced the following errors:

intr.c:342:46: error: address of array 'vlapic->regs->data' will always evaluate to 'true'

      [-Werror,-Wpointer-bool-conversion]
                if ( vlapic && vlapic->regs->data )
                            ~~ ~~~~~~~~~~~~~~^~~~
intr.c:352:42: error: address of array 'pi_desc->pir' will always evaluate to 'true'
      [-Werror,-Wpointer-bool-conversion]
                if ( pi_desc && pi_desc->pir )
                             ~~ ~~~~~~~~~^~~

Both of those checks are done against static arrays, which doesn't seem to make much sense, so just remove them.

---
NB: maybe the first check should be against vlapic->regs?
---
Cc: Jun Nakajima <[email protected]>
Cc: Kevin Tian <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: Chao Gao <[email protected]>

---
 xen/arch/x86/hvm/vmx/intr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
xen/arch/x86/hvm/vmx/intr.c +2 -2
index 1e17c4e..b9a02d1 100644
@@ -339,7 +339,7 @@ void vmx_intr_assist(void)
                        current, intack.source, intack.vector, pt_vector);
 
                 vlapic = vcpu_vlapic(v);
-                if ( vlapic && vlapic->regs->data )
+                if ( vlapic )
                 {
                     word = (const void *)&vlapic->regs->data[APIC_IRR];
                     printk(XENLOG_ERR "vIRR:");
@@ -349,7 +349,7 @@ void vmx_intr_assist(void)
                 }
 
                 pi_desc = &v->arch.hvm_vmx.pi_desc;
-                if ( pi_desc && pi_desc->pir )
+                if ( pi_desc )
                 {
                     word = (const void *)&pi_desc->pir;
                     printk(XENLOG_ERR " PIR:");
Signature · 7 lines
2.10.1 (Apple Git-78)


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
#1 lore raw
Quoted 13 lines
Quoted 1 line
Quoted 1 line · On 14.02.17 at 11:37, <[email protected]> wrote:

997382 introduced the following errors:

intr.c:342:46: error: address of array 'vlapic->regs->data' will always evaluate to 'true'

      [-Werror,-Wpointer-bool-conversion]
                if ( vlapic && vlapic->regs->data )
                            ~~ ~~~~~~~~~~~~~~^~~~
intr.c:352:42: error: address of array 'pi_desc->pir' will always evaluate to 
'true'
      [-Werror,-Wpointer-bool-conversion]
                if ( pi_desc && pi_desc->pir )
                             ~~ ~~~~~~~~~^~~
Quoted 2 lines

Both of those checks are done against static arrays, which doesn't seem to make much sense, so just remove them.

Darn, I had meant to check while massaging the patch, but then forgot.

Quoted 3 lines

---
NB: maybe the first check should be against vlapic->regs?

Yes, please. Or I can do this while committing. The subject, btw, should probably include "clang", as neither I nor osstest have an issue with gcc?

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

#2 lore raw
Quoted 19 lines · Jan Beulich
Quoted 13 lines
Quoted 1 line
Quoted 1 line · On 14.02.17 at 11:37, <[email protected]> wrote:

997382 introduced the following errors:

intr.c:342:46: error: address of array 'vlapic->regs->data' will always evaluate to 'true'

      [-Werror,-Wpointer-bool-conversion]
                if ( vlapic && vlapic->regs->data )
                            ~~ ~~~~~~~~~~~~~~^~~~
intr.c:352:42: error: address of array 'pi_desc->pir' will always evaluate to 
'true'
      [-Werror,-Wpointer-bool-conversion]
                if ( pi_desc && pi_desc->pir )
                             ~~ ~~~~~~~~~^~~
Quoted 2 lines

Both of those checks are done against static arrays, which doesn't seem to make much sense, so just remove them.

Darn, I had meant to check while massaging the patch, but then forgot.

Quoted 7 lines
Quoted 3 lines

---
NB: maybe the first check should be against vlapic->regs?

Yes, please. Or I can do this while committing. The subject, btw, should probably include "clang", as neither I nor osstest have an issue with gcc?

If you don't mind please change the check while committing, so that it's against vlapic->regs. Regarding the subject, what about:

x86/vmx: fix compilation with clang after 997382

FWIW, neither the versions of clang in travis seem to pick this up:

https://travis-ci.org/xen-project/xen/builds/201180775

Thanks, Roger.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel