diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2019-09-23 09:12:39 +0200 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2019-09-23 09:12:39 +0200 |
| commit | e0d95e100ff6d9188f188b431309ccba6075cf42 (patch) | |
| tree | 1c333da33da8b387f930de749465b908aa509f5f /pc-bios | |
| parent | 4300b7c2cd9f3f273804e8cca325842ccb93b1ad (diff) | |
| parent | 6b2a203579068127d7e93cb6f45d828ca04a2153 (diff) | |
Merge tag 's390-ccw-bios-2019-09-18' of https://gitlab.com/huth/qemu into s390-next
Small fixes for the s390-ccw firmware
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/s390-ccw/main.c | 2 | ||||
| -rw-r--r-- | pc-bios/s390-ccw/netmain.c | 1 | ||||
| -rw-r--r-- | pc-bios/s390-netboot.img | bin | 67232 -> 67232 bytes |
3 files changed, 2 insertions, 1 deletions
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index a69c73349e..a21b386280 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -17,7 +17,7 @@ char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE))); static SubChannelId blk_schid = { .one = 1 }; -static char loadparm_str[LOADPARM_LEN + 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +static char loadparm_str[LOADPARM_LEN + 1]; QemuIplParameters qipl; IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE))); static bool have_iplb; diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c index f3542cb2cf..f2dcc01e27 100644 --- a/pc-bios/s390-ccw/netmain.c +++ b/pc-bios/s390-ccw/netmain.c @@ -269,6 +269,7 @@ static const char *get_uuid(void) : "d" (r0), "d" (r1), [addr] "a" (buf) : "cc", "memory"); if (cc) { + free(mem); return NULL; } diff --git a/pc-bios/s390-netboot.img b/pc-bios/s390-netboot.img Binary files differindex aa90fbccb1..b984ad0da0 100644 --- a/pc-bios/s390-netboot.img +++ b/pc-bios/s390-netboot.img |