From: Christian Borntraeger Date: Thu, 23 May 2013 11:51:41 +0000 (+0200) Subject: s390/ipl: Fix spurious errors in virtio X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~340 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=39c93c67c5995bd8db7a3fa3b95dcd4e6bc881a7;p=qemu-upstream-4.5-testing.git s390/ipl: Fix spurious errors in virtio With the ccw ipl code sometimes an error message like "virtio: trying to map MMIO memory" or "Guest moved used index from %u to %u" appeared. Turns out that the ccw bios did not zero out the vring, which might cause stale values in avail->idx and friends, especially on reboot. Lets zero out the relevant fields. To activate the patch we need to rebuild s390-ccw.img as well. Signed-off-by: Christian Borntraeger Message-id: 1369309901-418-1-git-send-email-borntraeger@de.ibm.com Signed-off-by: Anthony Liguori --- diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index 5b9e1dc10..f438af15a 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -114,8 +114,13 @@ static void vring_init(struct vring *vr, unsigned int num, void *p, vr->used = (void *)(((unsigned long)&vr->avail->ring[num] + align-1) & ~(align - 1)); + /* Zero out all relevant field */ + vr->avail->flags = 0; + vr->avail->idx = 0; + /* We're running with interrupts off anyways, so don't bother */ vr->used->flags = VRING_USED_F_NO_NOTIFY; + vr->used->idx = 0; debug_print_addr("init vr", vr); }