57 lines
2.2 KiB
Diff
57 lines
2.2 KiB
Diff
From c00df86dd570d78767c5435f97bbe1d06407e470 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Wed, 21 Apr 2021 17:48:48 +0200
|
|
Subject: [PATCH 28/39] pc-bios/s390-ccw/bootmap: Silence compiler warning from
|
|
Clang
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
RH-MergeRequest: 24: v7: Add support for building qemu-kvm with clang and safe-stack
|
|
RH-Commit: [1/11] 85e41a04a0f47afe23e62f70397a5f79b2703499 (jmaloy/qemu-kvm-centos-jon)
|
|
RH-Bugzilla: 1939509 1940132
|
|
RH-Acked-by: Danilo Cesar Lemes de Paula <ddepaula@redhat.com>
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
|
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")
|
|
Message-Id: <20210421163331.358178-1-thuth@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
(cherry picked from commit d08a64940452060ab7ad5eb49cd5801131c2b9ec)
|
|
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@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 b46997c0b7..56411ab3b6 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
|
|
|