diff options
| author | Dominik Dingel <dingel@linux.vnet.ibm.com> | 2013-04-30 07:15:57 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-05-06 17:30:01 +0200 |
| commit | ba1509c0a99ad4c852c22cbd46d244ec7dc90402 (patch) | |
| tree | 54d0a7a23546e22e258a7c01745cca4f70ada184 /hw/s390x | |
| parent | 2c4c71ee3a904bd07141c6499e5834818e6757f1 (diff) | |
| download | qemu-ba1509c0a99ad4c852c22cbd46d244ec7dc90402.tar.gz qemu-ba1509c0a99ad4c852c22cbd46d244ec7dc90402.tar.bz2 qemu-ba1509c0a99ad4c852c22cbd46d244ec7dc90402.zip | |
S390: Add virtio-blk boot
If no kernel IPL entry is specified, boot the bios and pass if available
device information for the first boot device (as given by the boot index).
The provided information will be used in the next commit from the BIOS.
Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/ipl.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index d14c548d88..0aeb003c9d 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -16,6 +16,8 @@ #include "elf.h" #include "hw/loader.h" #include "hw/sysbus.h" +#include "hw/s390x/virtio-ccw.h" +#include "hw/s390x/css.h" #define KERN_IMAGE_START 0x010000UL #define KERN_PARM_AREA 0x010480UL @@ -150,6 +152,22 @@ static void s390_ipl_reset(DeviceState *dev) env->psw.addr = ipl->start_addr; env->psw.mask = IPL_PSW_MASK; + + if (!ipl->kernel) { + /* booting firmware, tell what device to boot from */ + DeviceState *dev_st = get_boot_device(0); + VirtioCcwDevice *ccw_dev = (VirtioCcwDevice *) object_dynamic_cast( + OBJECT(&(dev_st->parent_obj)), "virtio-blk-ccw"); + + if (ccw_dev) { + env->regs[7] = ccw_dev->sch->cssid << 24 | + ccw_dev->sch->ssid << 16 | + ccw_dev->sch->devno; + } else { + env->regs[7] = -1; + } + } + s390_add_running_cpu(cpu); } |