Message ID | 1412692792-12325-9-git-send-email-cornelia.huck@de.ibm.com |
---|---|
State | New |
Headers | show |
Cornelia Huck <cornelia.huck@de.ibm.com> writes: > Note that we care only about the fields still in use for virtio v1.0. > > Reviewed-by: Thomas Huth <thuth@linux.vnet.ibm.com> > Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com> > Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Hi Cornelia, These patches all look good; I'm a bit nervous about our testing missing some conversion, so we'll need qemu patches for PCI so we can test on other platforms too. Thanks, Rusty.
On Mon, 13 Oct 2014 16:28:32 +1030 Rusty Russell <rusty@rustcorp.com.au> wrote: > Cornelia Huck <cornelia.huck@de.ibm.com> writes: > > Note that we care only about the fields still in use for virtio v1.0. > > > > Reviewed-by: Thomas Huth <thuth@linux.vnet.ibm.com> > > Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com> > > Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> > > Hi Cornelia, > > These patches all look good; Cool, thanks. > I'm a bit nervous about our testing > missing some conversion, so we'll need qemu patches for PCI so we can > test on other platforms too. The devices I looked at (blk and net) are probably OK as ccw needs to convert always. I agree that we want to test on other platforms as well, but unfortunately I not familiar enough with other platforms to feel confident enough to convert virtio-pci and test it :(
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 0a58140..08a8012 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -119,6 +119,10 @@ static int __virtblk_add_req(struct virtqueue *vq, sg_init_one(&status, &vbr->status, sizeof(vbr->status)); sgs[num_out + num_in++] = &status; + /* we only care about fields valid for virtio-1 */ + vbr->out_hdr.type = cpu_to_virtio_u32(vq->vdev, vbr->out_hdr.type); + vbr->out_hdr.sector = cpu_to_virtio_u64(vq->vdev, vbr->out_hdr.sector); + return virtqueue_add_sgs(vq, sgs, num_out, num_in, vbr, GFP_ATOMIC); }