[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.6 01/14] pc-bios/s390-ccw: add more disk layou
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH for-2.6 01/14] pc-bios/s390-ccw: add more disk layout checks |
Date: |
Fri, 18 Mar 2016 15:21:22 +0100 |
From: "Eugene (jno) Dvurechenski" <address@hidden>
Experiments showed possibility of few more "misconfigurations" in disk
layout. They are reported now.
Acked-by: Cornelia Huck <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Eugene (jno) Dvurechenski <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
pc-bios/s390-ccw/bootmap.c | 4 ++++
pc-bios/s390-ccw/bootmap.h | 9 +++++++++
2 files changed, 13 insertions(+)
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index 4925302..ca60c33 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -415,7 +415,11 @@ static void ipl_scsi(void)
/* The 0-th block (MBR) was already read into sec[] */
sclp_print("Using SCSI scheme.\n");
+ debug_print_int("MBR Version", mbr->version_id);
+ IPL_check(mbr->version_id == 1,
+ "Unknown MBR layout version, assuming version 1");
debug_print_int("program table", mbr->blockptr.blockno);
+ IPL_assert(mbr->blockptr.blockno, "No Program Table");
/* Parse the program table */
read_block(mbr->blockptr.blockno, sec,
diff --git a/pc-bios/s390-ccw/bootmap.h b/pc-bios/s390-ccw/bootmap.h
index f98765b..07e3b20 100644
--- a/pc-bios/s390-ccw/bootmap.h
+++ b/pc-bios/s390-ccw/bootmap.h
@@ -273,6 +273,15 @@ static inline void IPL_assert(bool term, const char
*message)
}
}
+static inline void IPL_check(bool term, const char *message)
+{
+ if (!term) {
+ sclp_print("\n! WARNING: ");
+ sclp_print(message);
+ sclp_print(" !\n");
+ }
+}
+
static const unsigned char ebc2asc[256] =
/* 0123456789abcdef0123456789abcdef */
"................................" /* 1F */
--
2.7.4
- [Qemu-devel] [PATCH for-2.6 00/14] s390-ccw bios patches, Cornelia Huck, 2016/03/18
- [Qemu-devel] [PATCH for-2.6 03/14] pc-bios/s390-ccw: add utility functions and "export" some others, Cornelia Huck, 2016/03/18
- [Qemu-devel] [PATCH for-2.6 01/14] pc-bios/s390-ccw: add more disk layout checks,
Cornelia Huck <=
- [Qemu-devel] [PATCH for-2.6 04/14] pc-bios/s390-ccw: qemuize types, Cornelia Huck, 2016/03/18
- [Qemu-devel] [PATCH for-2.6 10/14] pc-bios/s390-ccw: add virtio-scsi implementation, Cornelia Huck, 2016/03/18
- [Qemu-devel] [PATCH for-2.6 11/14] pc-bios/s390-ccw: enable virtio-scsi, Cornelia Huck, 2016/03/18
- [Qemu-devel] [PATCH for-2.6 05/14] pc-bios/s390-ccw: update virtio implementation to allow up to 3 vrings, Cornelia Huck, 2016/03/18
- [Qemu-devel] [PATCH for-2.6 09/14] pc-bios/s390-ccw: add scsi definitions, Cornelia Huck, 2016/03/18
- [Qemu-devel] [PATCH for-2.6 13/14] pc-bios/s390-ccw: disambiguation of "No zIPL magic" message, Cornelia Huck, 2016/03/18
- [Qemu-devel] [PATCH for-2.6 07/14] pc-bios/s390-ccw: make provisions for different backends, Cornelia Huck, 2016/03/18
- [Qemu-devel] [PATCH for-2.6 08/14] pc-bios/s390-ccw: add simplified virtio call, Cornelia Huck, 2016/03/18
- [Qemu-devel] [PATCH for-2.6 02/14] pc-bios/s390-ccw: virtio_panic -> panic, Cornelia Huck, 2016/03/18
- [Qemu-devel] [PATCH for-2.6 14/14] s390-ccw.img: rebuild image, Cornelia Huck, 2016/03/18