david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390-ccw.img: Get queue config from host.

Browse Source 
Ask the host about the configuration instead of guessing it.

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Cornelia Huck 2013-04-26 02:12:55 +00:00 committed by Alexander Graf
parent 0f3f1f302f
commit abbbe3de4a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pc-bios/s390-ccw/virtio.c
View File

@ -257,17 +257,21 @@ int virtio_read(ulong sector, void *load_addr)
void virtio_setup_block(struct subchannel_id schid) void virtio_setup_block(struct subchannel_id schid)
{ {
struct vq_info_block info; struct vq_info_block info;
struct vq_config_block config = {};
virtio_reset(schid); virtio_reset(schid);
/* XXX need to fetch the 128 from host */ config.index = 0;
vring_init(&block, 128, (void*)(100 * 1024 * 1024), if (run_ccw(schid, CCW_CMD_READ_VQ_CONF, &config, sizeof(config))) {
virtio_panic("Could not get block device configuration\n");
}
vring_init(&block, config.num, (void*)(100 * 1024 * 1024),
KVM_S390_VIRTIO_RING_ALIGN); KVM_S390_VIRTIO_RING_ALIGN);
info.queue = (100ULL * 1024ULL* 1024ULL); info.queue = (100ULL * 1024ULL* 1024ULL);
info.align = KVM_S390_VIRTIO_RING_ALIGN; info.align = KVM_S390_VIRTIO_RING_ALIGN;
info.index = 0; info.index = 0;
info.num = 128; info.num = config.num;
block.schid = schid; block.schid = schid;
if (!run_ccw(schid, CCW_CMD_SET_VQ, &info, sizeof(info))) { if (!run_ccw(schid, CCW_CMD_SET_VQ, &info, sizeof(info))) {

5
pc-bios/s390-ccw/virtio.h
View File

@ -53,6 +53,11 @@ struct vq_info_block {
u16 num; u16 num;
} __attribute__((packed)); } __attribute__((packed));
struct vq_config_block {
u16 index;
u16 num;
} __attribute__((packed));
struct virtio_dev { struct virtio_dev {
struct virtio_dev_header *header; struct virtio_dev_header *header;
struct virtio_vqconfig *vqconfig; struct virtio_vqconfig *vqconfig;