On Wed, 29 Apr 2015 23:24:03 +0800
Shannon Zhao <shannon.z...@linaro.org> wrote:
> As only one place in virtio-net.c uses DEFINE_VIRTIO_NET_FEATURES,
> there is no need to expose it. Inline it into virtio-net.c to avoid
> wrongly use.
>
> Signed-off-by: Shannon Zhao <zhaoshengl...@huawei.com>
> Signed-off-by: Shannon Zhao <shannon.z...@linaro.org>
> ---
> hw/net/virtio-net.c | 42
> +++++++++++++++++++++++++++++++++++++++++-
> include/hw/virtio/virtio-net.h | 24 ------------------------
> 2 files changed, 41 insertions(+), 25 deletions(-)
>
> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
> index 5c38ac2..6ed2e78 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -1725,7 +1725,47 @@ static void virtio_net_instance_init(Object *obj)
> }
>
> static Property virtio_net_properties[] = {
> - DEFINE_VIRTIO_NET_FEATURES(VirtIONet, host_features),
> + DEFINE_PROP_BIT("any_layout", VirtIONet, host_features,
> VIRTIO_F_ANY_LAYOUT,
> + true),
Hm, the indentation after the line break looks a bit off here (same for
some of the feature bits further down).
> + DEFINE_PROP_BIT("csum", VirtIONet, host_features, VIRTIO_NET_F_CSUM,
> true),
> + DEFINE_PROP_BIT("guest_csum", VirtIONet, host_features,
> + VIRTIO_NET_F_GUEST_CSUM, true),
> + DEFINE_PROP_BIT("gso", VirtIONet, host_features, VIRTIO_NET_F_GSO, true),
> + DEFINE_PROP_BIT("guest_tso4", VirtIONet, host_features,
> + VIRTIO_NET_F_GUEST_TSO4, true),
> + DEFINE_PROP_BIT("guest_tso6", VirtIONet, host_features,
> + VIRTIO_NET_F_GUEST_TSO6, true),
> + DEFINE_PROP_BIT("guest_ecn", VirtIONet, host_features,
> + VIRTIO_NET_F_GUEST_ECN, true),
> + DEFINE_PROP_BIT("guest_ufo", VirtIONet, host_features,
> + VIRTIO_NET_F_GUEST_UFO, true),
> + DEFINE_PROP_BIT("guest_announce", VirtIONet, host_features,
> + VIRTIO_NET_F_GUEST_ANNOUNCE, true),
> + DEFINE_PROP_BIT("host_tso4", VirtIONet, host_features,
> + VIRTIO_NET_F_HOST_TSO4, true),
> + DEFINE_PROP_BIT("host_tso6", VirtIONet, host_features,
> + VIRTIO_NET_F_HOST_TSO6, true),
> + DEFINE_PROP_BIT("host_ecn", VirtIONet, host_features,
> VIRTIO_NET_F_HOST_ECN,
> + true),
> + DEFINE_PROP_BIT("host_ufo", VirtIONet, host_features,
> VIRTIO_NET_F_HOST_UFO,
> + true),
> + DEFINE_PROP_BIT("mrg_rxbuf", VirtIONet, host_features,
> + VIRTIO_NET_F_MRG_RXBUF, true),
> + DEFINE_PROP_BIT("status", VirtIONet, host_features, VIRTIO_NET_F_STATUS,
> + true),
> + DEFINE_PROP_BIT("ctrl_vq", VirtIONet, host_features,
> VIRTIO_NET_F_CTRL_VQ,
> + true),
> + DEFINE_PROP_BIT("ctrl_rx", VirtIONet, host_features,
> VIRTIO_NET_F_CTRL_RX,
> + true),
> + DEFINE_PROP_BIT("ctrl_vlan", VirtIONet, host_features,
> + VIRTIO_NET_F_CTRL_VLAN, true),
> + DEFINE_PROP_BIT("ctrl_rx_extra", VirtIONet, host_features,
> + VIRTIO_NET_F_CTRL_RX_EXTRA, true),
> + DEFINE_PROP_BIT("ctrl_mac_addr", VirtIONet, host_features,
> + VIRTIO_NET_F_CTRL_MAC_ADDR, true),
> + DEFINE_PROP_BIT("ctrl_guest_offloads", VirtIONet, host_features,
> + VIRTIO_NET_F_CTRL_GUEST_OFFLOADS, true),
> + DEFINE_PROP_BIT("mq", VirtIONet, host_features, VIRTIO_NET_F_MQ, false),
> DEFINE_NIC_PROPERTIES(VirtIONet, nic_conf),
> DEFINE_PROP_UINT32("x-txtimer", VirtIONet, net_conf.txtimer,
> TX_TIMER_INTERVAL),
