Blame SOURCES/kvm-pc-bios-s390-ccw-Introduce-ENODEV-define-and-remove-.patch

a19a21
From 7b3a7cbfc5872e088f13e11f5c38dc5ac80c3330 Mon Sep 17 00:00:00 2001
a19a21
From: Thomas Huth <thuth@redhat.com>
a19a21
Date: Fri, 9 Oct 2020 10:08:43 -0400
a19a21
Subject: [PATCH 07/14] pc-bios/s390-ccw: Introduce ENODEV define and remove
a19a21
 guards of others
a19a21
a19a21
RH-Author: Thomas Huth <thuth@redhat.com>
a19a21
Message-id: <20201009100849.264994-4-thuth@redhat.com>
a19a21
Patchwork-id: 98597
a19a21
O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 3/9] pc-bios/s390-ccw: Introduce ENODEV define and remove guards of others
a19a21
Bugzilla: 1846975
a19a21
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
a19a21
RH-Acked-by: David Hildenbrand <david@redhat.com>
a19a21
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
a19a21
a19a21
Remove the "#ifndef E..." guards from the defines here - the header
a19a21
guard S390_CCW_H at the top of the file should avoid double definition,
a19a21
and if the error code is defined in a different file already, we're in
a19a21
trouble anyway, then it's better to see the error at compile time instead
a19a21
of hunting weird behavior during runtime later.
a19a21
Also define ENODEV - we will use this in a later patch.
a19a21
a19a21
Message-Id: <20200806105349.632-4-thuth@redhat.com>
a19a21
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
a19a21
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
a19a21
Signed-off-by: Thomas Huth <thuth@redhat.com>
a19a21
(cherry picked from commit f3180b0266386b31deb7bb83fcaea68af7d1bcee)
a19a21
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
a19a21
---
a19a21
 pc-bios/s390-ccw/s390-ccw.h | 6 ++----
a19a21
 1 file changed, 2 insertions(+), 4 deletions(-)
a19a21
a19a21
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
a19a21
index 21f27e7990..ae432c40b8 100644
a19a21
--- a/pc-bios/s390-ccw/s390-ccw.h
a19a21
+++ b/pc-bios/s390-ccw/s390-ccw.h
a19a21
@@ -27,12 +27,10 @@ typedef unsigned long long __u64;
a19a21
 #define false 0
a19a21
 #define PAGE_SIZE 4096
a19a21
 
a19a21
-#ifndef EIO
a19a21
 #define EIO     1
a19a21
-#endif
a19a21
-#ifndef EBUSY
a19a21
 #define EBUSY   2
a19a21
-#endif
a19a21
+#define ENODEV  3
a19a21
+
a19a21
 #ifndef NULL
a19a21
 #define NULL    0
a19a21
 #endif
a19a21
-- 
a19a21
2.27.0
a19a21