[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/12] pc-bios/s390-ccw: add boot entry selection to
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 10/12] pc-bios/s390-ccw: add boot entry selection to El Torito routine |
Date: |
Tue, 2 May 2017 15:36:02 +0200 |
From: "Eugene (jno) Dvurechenski" <address@hidden>
If there is no LOADPARM given or '0' specified, then IPL the first
matched entry. Otherwise IPL the matching entry of that number.
Signed-off-by: Eugene (jno) Dvurechenski <address@hidden>
Signed-off-by: Farhan Ali <address@hidden>
Reviewed-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
pc-bios/s390-ccw/bootmap.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index e974350b6f..523fa78c5f 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -655,6 +655,7 @@ static IsoBcSection *find_iso_bc_entry(void)
IsoBcEntry *e = (IsoBcEntry *)sec;
uint32_t offset = find_iso_bc();
int i;
+ unsigned int loadparm = get_loadparm_index();
if (!offset) {
return NULL;
@@ -675,7 +676,11 @@ static IsoBcSection *find_iso_bc_entry(void)
for (i = 1; i < ISO_BC_ENTRY_PER_SECTOR; i++) {
if (e[i].id == ISO_BC_BOOTABLE_SECTION) {
if (is_iso_bc_entry_compatible(&e[i].body.sect)) {
- return &e[i].body.sect;
+ if (loadparm <= 1) {
+ /* found, default, or unspecified */
+ return &e[i].body.sect;
+ }
+ loadparm--;
}
}
}
--
2.11.0
- [Qemu-devel] [PULL 00/12] next batch of s390x patches, Cornelia Huck, 2017/05/02
- [Qemu-devel] [PULL 02/12] hw/s390x/ipl: enable LOADPARM in IPIB for a boot device, Cornelia Huck, 2017/05/02
- [Qemu-devel] [PULL 04/12] util/qemu-config: Add loadparm to qemu machine_opts, Cornelia Huck, 2017/05/02
- [Qemu-devel] [PULL 03/12] hw/s390x/sclp: update LOADPARM in SCP Info, Cornelia Huck, 2017/05/02
- [Qemu-devel] [PULL 06/12] pc-bios/s390-ccw: get LOADPARM stored in SCP Read Info, Cornelia Huck, 2017/05/02
- [Qemu-devel] [PULL 07/12] pc-bios/s390-ccw: provide a function to interpret LOADPARM value, Cornelia Huck, 2017/05/02
- [Qemu-devel] [PULL 05/12] pc-bios/s390-ccw: Make ebcdic/ascii conversion public, Cornelia Huck, 2017/05/02
- [Qemu-devel] [PULL 01/12] hw/s390x: provide loadparm property for the machine, Cornelia Huck, 2017/05/02
- [Qemu-devel] [PULL 08/12] pc-bios/s390-ccw: provide entry selection on LOADPARM for SCSI disk, Cornelia Huck, 2017/05/02
- [Qemu-devel] [PULL 10/12] pc-bios/s390-ccw: add boot entry selection to El Torito routine,
Cornelia Huck <=
- [Qemu-devel] [PULL 09/12] pc-bios/s390-ccw: add boot entry selection for ECKD DASD, Cornelia Huck, 2017/05/02
- [Qemu-devel] [PULL 11/12] pc-bios/s390-ccw.img: update image, Cornelia Huck, 2017/05/02
- [Qemu-devel] [PULL 12/12] hw/s390x/ipl: Fix crash with virtio-scsi-pci device, Cornelia Huck, 2017/05/02
- Re: [Qemu-devel] [PULL 00/12] next batch of s390x patches, Stefan Hajnoczi, 2017/05/05