From 85d1277e668106294d134a101729c6f36289da1a Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Tue, 1 Jul 2014 00:01:58 +0800 Subject: virtio: move common virtio properties to bus class device The two common virtio features can be defined per bus, so move all into bus class device to make code more clean. As discussed with cornelia, s390-virtio-blk doesn't support the two features at all, so keep s390-virtio as it. Acked-by: Cornelia Huck #for s390 ccw Suggested-by: Paolo Bonzini Signed-off-by: Ming Lei Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin MST: rebase and resolve conflicts --- include/hw/virtio/virtio-net.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/hw/virtio/virtio-net.h') diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index f7fccc08a4..6ceb5aa92e 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -258,7 +258,6 @@ struct virtio_net_ctrl_mq { #define VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET 0 #define DEFINE_VIRTIO_NET_FEATURES(_state, _field) \ - DEFINE_VIRTIO_COMMON_FEATURES(_state, _field), \ DEFINE_PROP_BIT("any_layout", _state, _field, VIRTIO_F_ANY_LAYOUT, true), \ DEFINE_PROP_BIT("csum", _state, _field, VIRTIO_NET_F_CSUM, true), \ DEFINE_PROP_BIT("guest_csum", _state, _field, VIRTIO_NET_F_GUEST_CSUM, true), \ -- cgit 1.4.1