Commit 87108bb2 authored by Shannon Zhao's avatar Shannon Zhao Committed by Michael S. Tsirkin
Browse files

virtio-net: move qdev properties into virtio-net.c 



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: default avatarShannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 710e2d90

hw/net/virtio-net.c

+42 −2
Original line number Diff line number Diff line
@@ -1707,7 +1707,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),

    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),

include/hw/virtio/virtio-net.h

+0 −24
Original line number Diff line number Diff line
@@ -109,30 +109,6 @@ typedef struct VirtIONet { 
#define VIRTIO_NET_CTRL_GUEST_OFFLOADS   5

 #define VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET        0



#define DEFINE_VIRTIO_NET_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), \

        DEFINE_PROP_BIT("gso", _state, _field, VIRTIO_NET_F_GSO, true), \

        DEFINE_PROP_BIT("guest_tso4", _state, _field, VIRTIO_NET_F_GUEST_TSO4, true), \

        DEFINE_PROP_BIT("guest_tso6", _state, _field, VIRTIO_NET_F_GUEST_TSO6, true), \

        DEFINE_PROP_BIT("guest_ecn", _state, _field, VIRTIO_NET_F_GUEST_ECN, true), \

        DEFINE_PROP_BIT("guest_ufo", _state, _field, VIRTIO_NET_F_GUEST_UFO, true), \

        DEFINE_PROP_BIT("guest_announce", _state, _field, VIRTIO_NET_F_GUEST_ANNOUNCE, true), \

        DEFINE_PROP_BIT("host_tso4", _state, _field, VIRTIO_NET_F_HOST_TSO4, true), \

        DEFINE_PROP_BIT("host_tso6", _state, _field, VIRTIO_NET_F_HOST_TSO6, true), \

        DEFINE_PROP_BIT("host_ecn", _state, _field, VIRTIO_NET_F_HOST_ECN, true), \

        DEFINE_PROP_BIT("host_ufo", _state, _field, VIRTIO_NET_F_HOST_UFO, true), \

        DEFINE_PROP_BIT("mrg_rxbuf", _state, _field, VIRTIO_NET_F_MRG_RXBUF, true), \

        DEFINE_PROP_BIT("status", _state, _field, VIRTIO_NET_F_STATUS, true), \

        DEFINE_PROP_BIT("ctrl_vq", _state, _field, VIRTIO_NET_F_CTRL_VQ, true), \

        DEFINE_PROP_BIT("ctrl_rx", _state, _field, VIRTIO_NET_F_CTRL_RX, true), \

        DEFINE_PROP_BIT("ctrl_vlan", _state, _field, VIRTIO_NET_F_CTRL_VLAN, true), \

        DEFINE_PROP_BIT("ctrl_rx_extra", _state, _field, VIRTIO_NET_F_CTRL_RX_EXTRA, true), \

        DEFINE_PROP_BIT("ctrl_mac_addr", _state, _field, VIRTIO_NET_F_CTRL_MAC_ADDR, true), \

        DEFINE_PROP_BIT("ctrl_guest_offloads", _state, _field, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS, true), \

        DEFINE_PROP_BIT("mq", _state, _field, VIRTIO_NET_F_MQ, false)



#define DEFINE_VIRTIO_NET_PROPERTIES(_state, _field)                           \

    DEFINE_PROP_UINT32("x-txtimer", _state, _field.txtimer, TX_TIMER_INTERVAL),\

    DEFINE_PROP_INT32("x-txburst", _state, _field.txburst, TX_BURST),          \