diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-29 07:30:21 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-29 07:30:21 -0500 |
| commit | b0a71c3b397b12db727ce483f01b3336160ef6a1 (patch) | |
| tree | 7ee48415239830c788ce4438624c39f6041b3963 /pc-bios/s390-ccw/main.c | |
| parent | f60a0d6ab9ea9ba900ba3936c3471851f28f7bc4 (diff) | |
| parent | 867b18db2155c0c99ab767c4ac563e144c85871d (diff) | |
| download | qemu-b0a71c3b397b12db727ce483f01b3336160ef6a1.tar.gz | |
Merge remote-tracking branch 'agraf/s390-for-upstream' into staging
# By Alexander Graf (1) and others
# Via Alexander Graf
* agraf/s390-for-upstream:
s390: update s390-ccw.img
s390/ipl: Fix boot order
s390/IPL: Allow boot from other ssid than 0
Message-id: 1375092324-23943-1-git-send-email-agraf@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'pc-bios/s390-ccw/main.c')
| -rw-r--r-- | pc-bios/s390-ccw/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index 1665c57225..c5d533231b 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -35,6 +35,13 @@ static void virtio_setup(uint64_t dev_info) check_devno = true; dev_no = dev_info & 0xffff; debug_print_int("device no. ", dev_no); + blk_schid.ssid = (dev_info >> 16) & 0x3; + if (blk_schid.ssid != 0) { + debug_print_int("ssid ", blk_schid.ssid); + if (enable_mss_facility() != 0) { + virtio_panic("Failed to enable mss facility\n"); + } + } } for (i = 0; i < 0x10000; i++) { |