OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

S390: Add virtio-blk boot

Browse Source 
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>
This commit is contained in:
Dominik Dingel 2013-04-30 07:15:57 +00:00 committed by Alexander Graf
parent 2c4c71ee3a
commit ba1509c0a9
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/s390x/ipl.c
View File

@ -16,6 +16,8 @@
#include "elf.h" #include "elf.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/s390x/virtio-ccw.h"
#include "hw/s390x/css.h"
#define KERN_IMAGE_START 0x010000UL #define KERN_IMAGE_START 0x010000UL
#define KERN_PARM_AREA 0x010480UL #define KERN_PARM_AREA 0x010480UL
@ -150,6 +152,22 @@ static void s390_ipl_reset(DeviceState *dev)
env->psw.addr = ipl->start_addr; env->psw.addr = ipl->start_addr;
env->psw.mask = IPL_PSW_MASK; 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); s390_add_running_cpu(cpu);
} }