On Tue, 25 Nov 2014 18:41:35 +0200 "Michael S. Tsirkin" <m...@redhat.com> wrote:
> disable virtio 1.0 in transports that don't > support it yet. I'd prefer if you disabled it for _every_ transport in this patch, until the needed infrastructure is in place. Else this is a bit confusing. > We will gradually re-enable as support is added. > > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> > --- > drivers/lguest/lguest_device.c | 3 ++- > drivers/misc/mic/card/mic_virtio.c | 2 ++ > drivers/s390/kvm/virtio_ccw.c | 3 ++- > drivers/virtio/virtio_mmio.c | 2 ++ > 4 files changed, 8 insertions(+), 2 deletions(-) Why do you disable ccw but not pci? (Doesn't pci need any changes transport-side?) And you missed the old s390 virtio transport in drivers/s390/kvm/kvm_virtio.c :) > diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c > index abba04d..08536f0 100644 > --- a/drivers/s390/kvm/virtio_ccw.c > +++ b/drivers/s390/kvm/virtio_ccw.c > @@ -704,7 +704,8 @@ static u64 virtio_ccw_get_features(struct virtio_device > *vdev) > out_free: > kfree(features); > kfree(ccw); > - return rc; > + /* TODO: enable virtio 1.0 */ > + return rc & ~BIT_ULL(VIRTIO_F_VERSION_1);; double ';' FWIW, as negotiating a revision >= 1 is a pre-req for virtio 1.0 support on ccw, virtio 1.0 is already implicitly disabled. > } > > static void virtio_ccw_finalize_features(struct virtio_device *vdev) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
