[Qemu-commits] [qemu/qemu] 554f80: pc-bios/s390-ccw: virtio_load_direct() can't load ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 554f80896dbdc6ce5bb01eab9659facf05ccf168
      
https://github.com/qemu/qemu/commit/554f80896dbdc6ce5bb01eab9659facf05ccf168
  Author: David Hildenbrand <address@hidden>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

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

  Log Message:
  -----------
  pc-bios/s390-ccw: virtio_load_direct() can't load max number of sectors

The number of sectors to read is given by the last 16 bit of rec_list2.
1 is added in order to get to the real number of sectors to read (0x0000
-> read 1 block). For now, the maximum number (0xffff) led to 0 sectors
being read.

This fixes a bug where a large initrd (62MB) could not be ipled anymore.

Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 962982329029acb6651f81b47cb401e593bb62df
      
https://github.com/qemu/qemu/commit/962982329029acb6651f81b47cb401e593bb62df
  Author: Christian Borntraeger <address@hidden>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

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

  Log Message:
  -----------
  pc-bios/s390-ccw: do a subsystem reset before running the guest

The loader BIOS has already activated several devices. Let's do a
subsystem reset before jumping into the guest. As there is no direct
way of doing so, we use diagnose 308 to bring the system in a
defined state. This is similar to what kdump on s390 uses. We have
to define a small trampoline function that restores the low bytes
to whatever the bootmap has written there.

Signed-off-by: Christian Borntraeger <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: c77cd87cf54f003748f29c14ea1ddaecfc5c653f
      
https://github.com/qemu/qemu/commit/c77cd87cf54f003748f29c14ea1ddaecfc5c653f
  Author: Eugene (jno) Dvurechenski <address@hidden>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

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

  Log Message:
  -----------
  pc-bios/s390-ccw: fix for fragmented SCSI bootmap

We need to interpret the last entry of the bootmap with zero
block count as "continuation pointer".
The "last entry" is being detected by pre-filling of the scratch
space with known values and respective look-ahead.

Signed-off-by: Eugene (jno) Dvurechenski <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 4ff51e66374706d22c7e37b094a3b7a464b8ac91
      
https://github.com/qemu/qemu/commit/4ff51e66374706d22c7e37b094a3b7a464b8ac91
  Author: Jens Freimann <address@hidden>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

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

  Log Message:
  -----------
  pc-bios/s390-ccw: update s390-ccw.img binary

Update s390-ccw.img to match with latest fixes

Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 9f862687eaf7335deb8955e1c25e1d36b9b3c90c
      
https://github.com/qemu/qemu/commit/9f862687eaf7335deb8955e1c25e1d36b9b3c90c
  Author: Peter Maydell <address@hidden>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

  Changed paths:
    M pc-bios/s390-ccw.img
    M pc-bios/s390-ccw/bootmap.c
    M pc-bios/s390-ccw/virtio.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20140623-2' into 
staging

A couple of s390-ccw bios bugfixes: Fix booting for some bootmaps and get
the devices to a sane state before running the guest.

# gpg: Signature made Mon 23 Jun 2014 13:22:32 BST using RSA key ID C6F02FAF
# gpg: Can't check signature: public key not found

* remotes/cohuck/tags/s390x-20140623-2:
  pc-bios/s390-ccw: update s390-ccw.img binary
  pc-bios/s390-ccw: fix for fragmented SCSI bootmap
  pc-bios/s390-ccw: do a subsystem reset before running the guest
  pc-bios/s390-ccw: virtio_load_direct() can't load max number of sectors

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/d9c1647d896d...9f862687eaf7