[Qemu-commits] [qemu/qemu] 6673de: pc-bios/s390-ccw: Do not pre-initialize empty array

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6673ded76c679ef17097782a13754ba905b917f8
      
https://github.com/qemu/qemu/commit/6673ded76c679ef17097782a13754ba905b917f8
  Author: Thomas Huth <address@hidden>
  Date:   2019-09-18 (Wed, 18 Sep 2019)

  Changed paths:
    M pc-bios/s390-ccw/main.c

  Log Message:
  -----------
  pc-bios/s390-ccw: Do not pre-initialize empty array

Since commit 339686a358b11a231aa5b6d1424e7a1460d7f277 ("pc-bios/s390-ccw:
zero out bss section"), we are clearing now the BSS in start.S, so there
is no need to pre-initialize the loadparm_str array with zeroes anymore.

Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 09be82ce53e8269412544521d449c44305beccf3
      
https://github.com/qemu/qemu/commit/09be82ce53e8269412544521d449c44305beccf3
  Author: Yifan Luo <address@hidden>
  Date:   2019-09-18 (Wed, 18 Sep 2019)

  Changed paths:
    M pc-bios/s390-ccw/netmain.c

  Log Message:
  -----------
  pc-bios/s390-ccw/net: fix a possible memory leak in get_uuid()

There is a possible memory leak in get_uuid(). Should free allocated mem
before
return NULL.

Signed-off-by: Yifan Luo <address@hidden>
Message-Id: <02cf01d55267$86cf2850$946d78f0$@cmss.chinamobile.com>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: 6b2a203579068127d7e93cb6f45d828ca04a2153
      
https://github.com/qemu/qemu/commit/6b2a203579068127d7e93cb6f45d828ca04a2153
  Author: Thomas Huth <address@hidden>
  Date:   2019-09-18 (Wed, 18 Sep 2019)

  Changed paths:
    M pc-bios/s390-netboot.img

  Log Message:
  -----------
  pc-bios/s390-ccw: Rebuild the s390-netboot.img firmware image

The new image now contains the "pc-bios/s390-ccw/net: fix a possible
memory leak in get_uuid()" patch.

Signed-off-by: Thomas Huth <address@hidden>


  Commit: e0d95e100ff6d9188f188b431309ccba6075cf42
      
https://github.com/qemu/qemu/commit/e0d95e100ff6d9188f188b431309ccba6075cf42
  Author: Christian Borntraeger <address@hidden>
  Date:   2019-09-23 (Mon, 23 Sep 2019)

  Changed paths:
    M pc-bios/s390-ccw/main.c
    M pc-bios/s390-ccw/netmain.c
    M pc-bios/s390-netboot.img

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

Small fixes for the s390-ccw firmware


  Commit: 7d69e8bc3b0ca4e48b24e7cb9db6dd77fa0b3481
      
https://github.com/qemu/qemu/commit/7d69e8bc3b0ca4e48b24e7cb9db6dd77fa0b3481
  Author: Thomas Huth <address@hidden>
  Date:   2019-09-23 (Mon, 23 Sep 2019)

  Changed paths:
    M hw/intc/s390_flic_kvm.c
    M hw/intc/trace-events
    M target/s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: Officially require at least kernel 3.15

Since QEMU v2.10, the KVM acceleration does not work on older kernels
anymore since the code accidentally requires the KVM_CAP_DEVICE_CTRL
capability now - it should have been optional instead.
Instead of fixing the bug, we asked in the ChangeLog of QEMU 2.11 - 3.0
that people should speak up if they still need support of QEMU running
with KVM on older kernels, but seems like nobody really complained.
Thus let's make this official now and turn it into a proper error
message, telling the users to use at least kernel 3.15 now.

Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 7505deca0bfa859136ec6419dbafc504f22fcac2
      
https://github.com/qemu/qemu/commit/7505deca0bfa859136ec6419dbafc504f22fcac2
  Author: Christian Borntraeger <address@hidden>
  Date:   2019-09-23 (Mon, 23 Sep 2019)

  Changed paths:
    M target/s390x/cpu_models.c

  Log Message:
  -----------
  s390x/cpumodel: Add the z15 name to the description of gen15a

We now know that gen15a is called z15.

Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 8400efa51aa0a7908d7edb8ac6135e2fe69b4b37
      
https://github.com/qemu/qemu/commit/8400efa51aa0a7908d7edb8ac6135e2fe69b4b37
  Author: Peter Maydell <address@hidden>
  Date:   2019-09-23 (Mon, 23 Sep 2019)

  Changed paths:
    M hw/intc/s390_flic_kvm.c
    M hw/intc/trace-events
    M pc-bios/s390-ccw/main.c
    M pc-bios/s390-ccw/netmain.c
    M pc-bios/s390-netboot.img
    M target/s390x/cpu_models.c
    M target/s390x/kvm.c

  Log Message:
  -----------
  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) <address@hidden>" [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: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/e446ed5a29d1...8400efa51aa0