From: Peter Maydell Date: Mon, 23 Jun 2014 16:47:28 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20140623-2' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9f862687eaf7335deb8955e1c25e1d36b9b3c90c;p=qemu.git 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 --- 9f862687eaf7335deb8955e1c25e1d36b9b3c90c