Commit f56fc2d3 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

virtio_net: reuse constants from linux 



VIRTIO_NET_F_CTRL_GUEST_OFFLOADS now appears in the
linux header, let's reuse it.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 220a8846

include/hw/virtio/virtio-net.h

+0 −12
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 
#define VIRTIO_NET(obj) \

        OBJECT_CHECK(VirtIONet, (obj), TYPE_VIRTIO_NET)



#define VIRTIO_NET_F_CTRL_GUEST_OFFLOADS 2 /* Control channel offload

                                         * configuration support */



#define TX_TIMER_INTERVAL 150000 /* 150 us */



/* Limit the number of packets that can be sent via a single flush
@@ -100,15 +97,6 @@ typedef struct VirtIONet { 
    int announce_counter;

} VirtIONet;



/*

 * Control network offloads

 *

 * Dynamic offloads are available with the

 * VIRTIO_NET_F_CTRL_GUEST_OFFLOADS feature bit.

 */

#define VIRTIO_NET_CTRL_GUEST_OFFLOADS   5

#define VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET        0



void virtio_net_set_netclient_name(VirtIONet *n, const char *name,

                                   const char *type);

include/standard-headers/linux/virtio_net.h

+16 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
/* The feature bitmap for virtio net */

#define VIRTIO_NET_F_CSUM	0	/* Host handles pkts w/ partial csum */

#define VIRTIO_NET_F_GUEST_CSUM	1	/* Guest handles pkts w/ partial csum */

#define VIRTIO_NET_F_CTRL_GUEST_OFFLOADS 2 /* Dynamic offload configuration. */

#define VIRTIO_NET_F_MAC	5	/* Host has given MAC address. */

#define VIRTIO_NET_F_GUEST_TSO4	7	/* Guest can handle TSOv4 in. */

#define VIRTIO_NET_F_GUEST_TSO6	8	/* Guest can handle TSOv6 in. */
@@ -226,4 +227,19 @@ struct virtio_net_ctrl_mq { 
 #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN        1

 #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX        0x8000



/*

 * Control network offloads

 *

 * Reconfigures the network offloads that Guest can handle.

 *

 * Available with the VIRTIO_NET_F_CTRL_GUEST_OFFLOADS feature bit.

 *

 * Command data format matches the feature bit mask exactly.

 *

 * See VIRTIO_NET_F_GUEST_* for the list of offloads

 * that can be enabled/disabled.

 */

#define VIRTIO_NET_CTRL_GUEST_OFFLOADS   5

#define VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET        0



#endif /* _LINUX_VIRTIO_NET_H */