mirror of https://gitee.com/openkylin/qemu.git
pc-bios: s390x: Fix bootmap.c zipl component entry data handling
The two main types of zipl component entries are execute and load/data. The last member of the component entry struct therefore denotes either a PSW or an address. Let's make this a bit more clear by introducing a union and cleaning up the code that uses that struct member. The execute type component entries written by zipl contain short PSWs, not addresses. Let's mask them and only pass the address part to jump_to_IPL_code(uint64_t address) because it expects an address as visible by the name of the argument. Signed-off-by: Janosch Frank <frankja@linux.ibm.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20201006094249.50640-2-frankja@linux.ibm.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
468184ec90
commit
4906a4e41c
|
@ -10,6 +10,7 @@
|
|||
|
||||
#include "libc.h"
|
||||
#include "s390-ccw.h"
|
||||
#include "s390-arch.h"
|
||||
#include "bootmap.h"
|
||||
#include "virtio.h"
|
||||
#include "bswap.h"
|
||||
|
@ -448,7 +449,7 @@ static void zipl_load_segment(ComponentEntry *entry)
|
|||
char *blk_no = &err_msg[30]; /* where to print blockno in (those ZZs) */
|
||||
|
||||
blockno = entry->data.blockno;
|
||||
address = entry->load_address;
|
||||
address = entry->compdat.load_addr;
|
||||
|
||||
debug_print_int("loading segment at block", blockno);
|
||||
debug_print_int("addr", address);
|
||||
|
@ -526,7 +527,7 @@ static void zipl_run(ScsiBlockPtr *pte)
|
|||
IPL_assert(entry->component_type == ZIPL_COMP_ENTRY_EXEC, "No EXEC entry");
|
||||
|
||||
/* should not return */
|
||||
jump_to_IPL_code(entry->load_address);
|
||||
jump_to_IPL_code(entry->compdat.load_psw & PSW_MASK_SHORT_ADDR);
|
||||
}
|
||||
|
||||
static void ipl_scsi(void)
|
||||
|
|
|
@ -64,11 +64,16 @@ typedef struct BootMapTable {
|
|||
BootMapPointer entry[];
|
||||
} __attribute__ ((packed)) BootMapTable;
|
||||
|
||||
typedef union ComponentEntryData {
|
||||
uint64_t load_psw;
|
||||
uint64_t load_addr;
|
||||
} ComponentEntryData;
|
||||
|
||||
typedef struct ComponentEntry {
|
||||
ScsiBlockPtr data;
|
||||
uint8_t pad[7];
|
||||
uint8_t component_type;
|
||||
uint64_t load_address;
|
||||
ComponentEntryData compdat;
|
||||
} __attribute((packed)) ComponentEntry;
|
||||
|
||||
typedef struct ComponentHeader {
|
||||
|
|
Loading…
Reference in New Issue