diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-01-30 14:18:45 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-01-30 14:18:45 +0000 |
| commit | 204aa60b37c23a89e690d418f49787d274303ca7 (patch) | |
| tree | 902d059da93888c408d17ede0d92a1038cd4ff67 /hw/s390x/ipl.c | |
| parent | a09a2b5a4d85d4bf2f04b0e503d7dd7905967148 (diff) | |
| parent | 99029be1c2875cd857614397674bbf563ddb6f91 (diff) | |
Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jan-29-2020' into staging
MIPS queue for January 29th, 2020
# gpg: Signature made Wed 29 Jan 2020 18:29:43 GMT
# gpg: using RSA key D4972A8967F75A65
# gpg: Good signature from "Aleksandar Markovic <amarkovic@wavecomp.com>" [full]
# Primary key fingerprint: 8526 FBF1 5DA3 811F 4A01 DD75 D497 2A89 67F7 5A65
* remotes/amarkovic/tags/mips-queue-jan-29-2020:
target/mips: Add implementation of GINVT instruction
target/mips: Amend CP0 WatchHi register implementation
hw/core/loader: Let load_elf() populate a field with CPU-specific flags
target/mips: semihosting: Remove 'uhi_done' label in helper_do_semihosting()
disas: Add a field for target-dependant data to disassemble_info
target/mips: Rectify documentation on deprecating MIPS r4k machine
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/s390x/ipl.c')
| -rw-r--r-- | hw/s390x/ipl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index b3ae901529..ca8e7db467 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -139,7 +139,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) bios_size = load_elf(bios_filename, NULL, bios_translate_addr, &fwbase, - &ipl->bios_start_addr, NULL, NULL, 1, + &ipl->bios_start_addr, NULL, NULL, NULL, 1, EM_S390, 0, 0); if (bios_size > 0) { /* Adjust ELF start address to final location */ @@ -164,7 +164,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) if (ipl->kernel) { kernel_size = load_elf(ipl->kernel, NULL, NULL, NULL, &pentry, NULL, - NULL, 1, EM_S390, 0, 0); + NULL, NULL, 1, EM_S390, 0, 0); if (kernel_size < 0) { kernel_size = load_image_targphys(ipl->kernel, 0, ram_size); if (kernel_size < 0) { @@ -473,7 +473,8 @@ static int load_netboot_image(Error **errp) img_size = load_elf_ram(netboot_filename, NULL, NULL, NULL, &ipl->start_addr, - NULL, NULL, 1, EM_S390, 0, 0, NULL, false); + NULL, NULL, NULL, 1, EM_S390, 0, 0, NULL, + false); if (img_size < 0) { img_size = load_image_size(netboot_filename, ram_ptr, ram_size); |