]> git.ipfire.org Git - thirdparty/qemu.git/commit
s390x/ipl: Fix boot if no bootindex was specified
authorChristian Borntraeger <borntraeger@de.ibm.com>
Thu, 18 Jun 2015 14:37:39 +0000 (16:37 +0200)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Thu, 30 Jul 2015 02:47:15 +0000 (21:47 -0500)
commit99c3468d8fedac2bf8098fc4e9f050cbd62ab912
tree9bd50d3617a9c97a7adb673bb15e6ba8a623fc9e
parent1c17e8c7d3f045d0cebef524cb51fd6a6ecadc77
s390x/ipl: Fix boot if no bootindex was specified

commit fa92e218df1d ("s390x/ipl: avoid sign extension") introduced
a regression:

qemu-system-s390x -drive file=image.qcow,format=qcow2
does not boot, the bios states
"No virtio-blk device found!"

adding bootindex=1 does boot.

The reason is that the uint32_t as return value will not do the right
thing for the return -1 (default without bootindex).
The bios itself, will interpret a 64bit -1 as autodetect (but it will
interpret 32bit -1 as ccw device address ff.ff.ffff)

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: qemu-stable@nongnu.org # v2.3.0
Tested-by: Aurelien Jarno <aurelien@aurel32.net>
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
(cherry picked from commit 6efd2c2a125b4369b8def585b0dac35c849b5eb3)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/s390x/ipl.c