On Wed, 13 Sep 2017 13:50:28 +0200 Halil Pasic <pa...@linux.vnet.ibm.com> wrote:
> Replace direct access which implicitly assumes no IDA > or MIDA with the new ccw data stream interface which should > cope with these transparently in the future. > > Signed-off-by: Halil Pasic <pa...@linux.vnet.ibm.com> > @@ -488,7 +446,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) > } else { > virtio_bus_get_vdev_config(&dev->bus, vdev->config); > /* XXX config space endianness */ > - cpu_physical_memory_write(ccw.cda, vdev->config, len); > + ccw_dstream_write_buf(&sch->cds, vdev->config, len); > sch->curr_status.scsw.count = ccw.count - len; > ret = 0; > } > @@ -501,21 +459,13 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) > } > } > len = MIN(ccw.count, vdev->config_len); > - hw_len = len; > if (!ccw.cda) { > ret = -EFAULT; > } else { > - config = cpu_physical_memory_map(ccw.cda, &hw_len, 0); > - if (!config) { > - ret = -EFAULT; > - } else { > - len = hw_len; > - /* XXX config space endianness */ > - memcpy(vdev->config, config, len); > - cpu_physical_memory_unmap(config, hw_len, 0, hw_len); > + ret = ccw_dstream_read_buf(&sch->cds, vdev->config, len); > + if (!ret) { > virtio_bus_set_vdev_config(&dev->bus, vdev->config); > sch->curr_status.scsw.count = ccw.count - len; > - ret = 0; > } > } > break; It feels a bit odd that you remove the stale XXX comment only for one direction. Care to post a patch that removes them separately? Else I can do that as well. [I'd queue that patch in front of this patchset, but no need to resend for that.]