Commit 8400efa5 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20190923' into staging 



- bugfixes in ccw bios
- gen15a is called z15
- officially require a 3.15 kernel or later for kvm

# gpg: Signature made Mon 23 Sep 2019 08:18:32 BST
# gpg:                using RSA key 117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>" [full]
# Primary key fingerprint: F922 9381 A334 08F9 DBAB  FBCA 117B BC80 B5A6 1C7C

* remotes/borntraeger/tags/s390x-20190923:
  s390x/cpumodel: Add the z15 name to the description of gen15a
  s390x/kvm: Officially require at least kernel 3.15
  pc-bios/s390-ccw: Rebuild the s390-netboot.img firmware image
  pc-bios/s390-ccw/net: fix a possible memory leak in get_uuid()
  pc-bios/s390-ccw: Do not pre-initialize empty array

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e446ed5a 7505deca

hw/intc/s390_flic_kvm.c

+0 −6
Original line number Diff line number Diff line
@@ -589,12 +589,6 @@ static void kvm_s390_flic_realize(DeviceState *dev, Error **errp) 
        goto fail;

    }

    flic_state->fd = -1;

    if (!kvm_check_extension(kvm_state, KVM_CAP_DEVICE_CTRL)) {

        error_setg_errno(&errp_local, errno, "KVM is missing capability"

                         " KVM_CAP_DEVICE_CTRL");

        trace_flic_no_device_api(errno);

        goto fail;

    }



    cd.type = KVM_DEV_TYPE_FLIC;

    ret = kvm_vm_ioctl(kvm_state, KVM_CREATE_DEVICE, &cd);

hw/intc/trace-events

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ xics_ics_simple_eoi(int nr) "ics_eoi: irq 0x%x" 


# s390_flic_kvm.c

flic_create_device(int err) "flic: create device failed %d"

flic_no_device_api(int err) "flic: no Device Contral API support %d"

flic_reset_failed(int err) "flic: reset failed %d"



# s390_flic.c

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