Commit e0d95e10 authored by Christian Borntraeger's avatar Christian Borntraeger
Browse files

Merge tag 's390-ccw-bios-2019-09-18' of https://gitlab.com/huth/qemu into s390-next 

Small fixes for the s390-ccw firmware
parents 4300b7c2 6b2a2035

pc-bios/s390-ccw/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

pc-bios/s390-ccw/netmain.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

    }

pc-bios/s390-netboot.img

(65.7 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file