aboutsummaryrefslogtreecommitdiff
path: root/pc-bios
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2013-04-26 02:12:55 +0000
committerAlexander Graf <agraf@suse.de>2013-04-26 20:18:24 +0200
commitabbbe3de4aea92319f77cc9d402e983513d08539 (patch)
tree6fb3d1e9a61c74ecd8d9ba3c746a48983a1ec0d5 /pc-bios
parent0f3f1f302fd2021a5ce6cb170321d0a0d35bdec5 (diff)
downloadqemu-abbbe3de4aea92319f77cc9d402e983513d08539.zip
qemu-abbbe3de4aea92319f77cc9d402e983513d08539.tar.gz
qemu-abbbe3de4aea92319f77cc9d402e983513d08539.tar.bz2
s390-ccw.img: Get queue config from host.
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>
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/s390-ccw/virtio.c10
-rw-r--r--pc-bios/s390-ccw/virtio.h5
2 files changed, 12 insertions, 3 deletions
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index e0cede5..5b9e1dc 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -257,17 +257,21 @@ int virtio_read(ulong sector, void *load_addr)
void virtio_setup_block(struct subchannel_id schid)
{
struct vq_info_block info;
+ struct vq_config_block config = {};
virtio_reset(schid);
- /* XXX need to fetch the 128 from host */
- vring_init(&block, 128, (void*)(100 * 1024 * 1024),
+ config.index = 0;
+ 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);
info.queue = (100ULL * 1024ULL* 1024ULL);
info.align = KVM_S390_VIRTIO_RING_ALIGN;
info.index = 0;
- info.num = 128;
+ info.num = config.num;
block.schid = schid;
if (!run_ccw(schid, CCW_CMD_SET_VQ, &info, sizeof(info))) {
diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
index a33199d..86fdd57 100644
--- a/pc-bios/s390-ccw/virtio.h
+++ b/pc-bios/s390-ccw/virtio.h
@@ -53,6 +53,11 @@ struct vq_info_block {
u16 num;
} __attribute__((packed));
+struct vq_config_block {
+ u16 index;
+ u16 num;
+} __attribute__((packed));
+
struct virtio_dev {
struct virtio_dev_header *header;
struct virtio_vqconfig *vqconfig;