[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 10/16] virtio_net: reuse constants from linux
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 10/16] virtio_net: reuse constants from linux |
Date: |
Wed, 8 Jul 2015 12:42:00 +0300 |
VIRTIO_NET_F_CTRL_GUEST_OFFLOADS now appears in the
linux header, let's reuse it.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/virtio/virtio-net.h | 12 ------------
include/standard-headers/linux/virtio_net.h | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h
index 280dacf..60b11d5 100644
--- a/include/hw/virtio/virtio-net.h
+++ b/include/hw/virtio/virtio-net.h
@@ -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);
diff --git a/include/standard-headers/linux/virtio_net.h
b/include/standard-headers/linux/virtio_net.h
index 3209c90..a78f33e 100644
--- a/include/standard-headers/linux/virtio_net.h
+++ b/include/standard-headers/linux/virtio_net.h
@@ -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 */
--
MST
- [Qemu-devel] [PULL v2 01/16] dataplane: fix cross-endian issues, (continued)
- [Qemu-devel] [PULL v2 01/16] dataplane: fix cross-endian issues, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 03/16] acpi: split out ICH ACPI support, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 02/16] Revert "dataplane: allow virtio-1 devices", Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 04/16] ich9: add TCO interface emulation, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 06/16] ich9: implement strap SPKR pin logic, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 05/16] tests: add testcase for TCO watchdog emulation, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 07/16] hw/i386/pc: factor out pc_cmos_init_floppy(), Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 08/16] hw/i386/pc: reflect any FDC @ ioport 0x3f0 in the CMOS, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 09/16] hw/i386/pc: don't carry FDC from pc_basic_device_init() to pc_cmos_init(), Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 10/16] virtio_net: reuse constants from linux,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 12/16] pcie: Set the "link active" in the link status register, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 13/16] virtio: define virtio_pci_cfg_cap in header., Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 15/16] virtio fix cfg endian-ness for BE targets, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 14/16] virtio-pci: implement cfg capability, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 11/16] pci_regs.h: import from linux, Michael S. Tsirkin, 2015/07/08
- [Qemu-devel] [PULL v2 16/16] tco-test: fix up config accesses and re-enable, Michael S. Tsirkin, 2015/07/08
- Re: [Qemu-devel] [PULL v2 00/16] pc,virtio,pci: fixes and updates, Peter Maydell, 2015/07/08