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/virtio.c | |
| parent | f60a0d6ab9ea9ba900ba3936c3471851f28f7bc4 (diff) | |
| parent | 867b18db2155c0c99ab767c4ac563e144c85871d (diff) | |
| download | qemu-b0a71c3b397b12db727ce483f01b3336160ef6a1.zip qemu-b0a71c3b397b12db727ce483f01b3336160ef6a1.tar.gz qemu-b0a71c3b397b12db727ce483f01b3336160ef6a1.tar.bz2 | |
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/virtio.c')
| -rw-r--r-- | pc-bios/s390-ccw/virtio.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index f438af1..49f2d29 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -13,6 +13,8 @@ struct vring block; +static char chsc_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE))); + static long kvm_hypercall(unsigned long nr, unsigned long param1, unsigned long param2) { @@ -301,3 +303,19 @@ bool virtio_is_blk(struct subchannel_id schid) return true; } +int enable_mss_facility(void) +{ + int ret; + struct chsc_area_sda *sda_area = (struct chsc_area_sda *) chsc_page; + + memset(sda_area, 0, PAGE_SIZE); + sda_area->request.length = 0x0400; + sda_area->request.code = 0x0031; + sda_area->operation_code = 0x2; + + ret = chsc(sda_area); + if ((ret == 0) && (sda_area->response.code == 0x0001)) { + return 0; + } + return -EIO; +} |