[PATCH] pc-bios/s390-ccw/bootmap: Silence compiler warning from Clang

[PATCH] pc-bios/s390-ccw/bootmap: Silence compiler warning from Clang

[Thomas Huth]

When compiling the s390-ccw bios with Clang, the compiler complains:

 pc-bios/s390-ccw/bootmap.c:302:9: warning: logical not is only applied
  to the left hand side of this comparison [-Wlogical-not-parentheses]
    if (!mbr->dev_type == DEV_TYPE_ECKD) {
        ^              ~~

The code works (more or less by accident), since dev_type can only be
0 or 1, but it's better of course to use the intended != operator here
instead.

Fixes: 5dc739f343 ("Allow booting in case the first virtio-blk disk is bad")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 pc-bios/s390-ccw/bootmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index 44df7d16af..e4b2e5a1b0 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -299,7 +299,7 @@ static void ipl_eckd_cdl(void)
         sclp_print("Bad block size in zIPL section of IPL2 record.\n");
         return;
     }
-    if (!mbr->dev_type == DEV_TYPE_ECKD) {
+    if (mbr->dev_type != DEV_TYPE_ECKD) {
         sclp_print("Non-ECKD device type in zIPL section of IPL2 record.\n");
         return;
     }
-- 
2.27.0

Re: [PATCH] pc-bios/s390-ccw/bootmap: Silence compiler warning from Clang

[Philippe Mathieu-Daudé]

On 4/21/21 6:33 PM, Thomas Huth wrote:
> When compiling the s390-ccw bios with Clang, the compiler complains:
> 
>  pc-bios/s390-ccw/bootmap.c:302:9: warning: logical not is only applied
>   to the left hand side of this comparison [-Wlogical-not-parentheses]
>     if (!mbr->dev_type == DEV_TYPE_ECKD) {
>         ^              ~~
> 
> The code works (more or less by accident), since dev_type can only be
> 0 or 1, but it's better of course to use the intended != operator here
> instead.
> 
> Fixes: 5dc739f343 ("Allow booting in case the first virtio-blk disk is bad")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  pc-bios/s390-ccw/bootmap.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Re: [PATCH] pc-bios/s390-ccw/bootmap: Silence compiler warning from Clang

[Christian Borntraeger]

On 21.04.21 18:33, Thomas Huth wrote:
> When compiling the s390-ccw bios with Clang, the compiler complains:
> 
>   pc-bios/s390-ccw/bootmap.c:302:9: warning: logical not is only applied
>    to the left hand side of this comparison [-Wlogical-not-parentheses]
>      if (!mbr->dev_type == DEV_TYPE_ECKD) {
>          ^              ~~
> 
> The code works (more or less by accident), since dev_type can only be
> 0 or 1, but it's better of course to use the intended != operator here
> instead.
> 
> Fixes: 5dc739f343 ("Allow booting in case the first virtio-blk disk is bad")
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>

> ---
>   pc-bios/s390-ccw/bootmap.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
> index 44df7d16af..e4b2e5a1b0 100644
> --- a/pc-bios/s390-ccw/bootmap.c
> +++ b/pc-bios/s390-ccw/bootmap.c
> @@ -299,7 +299,7 @@ static void ipl_eckd_cdl(void)
>           sclp_print("Bad block size in zIPL section of IPL2 record.\n");
>           return;
>       }
> -    if (!mbr->dev_type == DEV_TYPE_ECKD) {
> +    if (mbr->dev_type != DEV_TYPE_ECKD) {
>           sclp_print("Non-ECKD device type in zIPL section of IPL2 record.\n");
>           return;
>       }
>