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