diff mbox series

[v1,5/8] virtio-net: Add tracking of the virtio guest feature bits

Message ID 20210901090804.7139-6-maxim.davydov@virtuozzo.com
State New
Headers show
Series Virtio features acknowledged by guest | expand

Commit Message

Maxim Davydov Sept. 1, 2021, 9:08 a.m. UTC 
Add tracking of the bits acknowledged by the guest

Signed-off-by: Maxim Davydov <maxim.davydov@virtuozzo.com>
---
 hw/net/virtio-net.c | 118 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 72 insertions(+), 46 deletions(-)
diff mbox series

Patch

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 16d20cd..2fd9171 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -3562,52 +3562,78 @@  static const VMStateDescription vmstate_virtio_net = {
 };
 
 static Property virtio_net_properties[] = {
-    DEFINE_PROP_BIT64("csum", VirtIONet, host_features,
-                    VIRTIO_NET_F_CSUM, true),
-    DEFINE_PROP_BIT64("guest_csum", VirtIONet, host_features,
-                    VIRTIO_NET_F_GUEST_CSUM, true),
-    DEFINE_PROP_BIT64("gso", VirtIONet, host_features, VIRTIO_NET_F_GSO, true),
-    DEFINE_PROP_BIT64("guest_tso4", VirtIONet, host_features,
-                    VIRTIO_NET_F_GUEST_TSO4, true),
-    DEFINE_PROP_BIT64("guest_tso6", VirtIONet, host_features,
-                    VIRTIO_NET_F_GUEST_TSO6, true),
-    DEFINE_PROP_BIT64("guest_ecn", VirtIONet, host_features,
-                    VIRTIO_NET_F_GUEST_ECN, true),
-    DEFINE_PROP_BIT64("guest_ufo", VirtIONet, host_features,
-                    VIRTIO_NET_F_GUEST_UFO, true),
-    DEFINE_PROP_BIT64("guest_announce", VirtIONet, host_features,
-                    VIRTIO_NET_F_GUEST_ANNOUNCE, true),
-    DEFINE_PROP_BIT64("host_tso4", VirtIONet, host_features,
-                    VIRTIO_NET_F_HOST_TSO4, true),
-    DEFINE_PROP_BIT64("host_tso6", VirtIONet, host_features,
-                    VIRTIO_NET_F_HOST_TSO6, true),
-    DEFINE_PROP_BIT64("host_ecn", VirtIONet, host_features,
-                    VIRTIO_NET_F_HOST_ECN, true),
-    DEFINE_PROP_BIT64("host_ufo", VirtIONet, host_features,
-                    VIRTIO_NET_F_HOST_UFO, true),
-    DEFINE_PROP_BIT64("mrg_rxbuf", VirtIONet, host_features,
-                    VIRTIO_NET_F_MRG_RXBUF, true),
-    DEFINE_PROP_BIT64("status", VirtIONet, host_features,
-                    VIRTIO_NET_F_STATUS, true),
-    DEFINE_PROP_BIT64("ctrl_vq", VirtIONet, host_features,
-                    VIRTIO_NET_F_CTRL_VQ, true),
-    DEFINE_PROP_BIT64("ctrl_rx", VirtIONet, host_features,
-                    VIRTIO_NET_F_CTRL_RX, true),
-    DEFINE_PROP_BIT64("ctrl_vlan", VirtIONet, host_features,
-                    VIRTIO_NET_F_CTRL_VLAN, true),
-    DEFINE_PROP_BIT64("ctrl_rx_extra", VirtIONet, host_features,
-                    VIRTIO_NET_F_CTRL_RX_EXTRA, true),
-    DEFINE_PROP_BIT64("ctrl_mac_addr", VirtIONet, host_features,
-                    VIRTIO_NET_F_CTRL_MAC_ADDR, true),
-    DEFINE_PROP_BIT64("ctrl_guest_offloads", VirtIONet, host_features,
-                    VIRTIO_NET_F_CTRL_GUEST_OFFLOADS, true),
-    DEFINE_PROP_BIT64("mq", VirtIONet, host_features, VIRTIO_NET_F_MQ, false),
-    DEFINE_PROP_BIT64("rss", VirtIONet, host_features,
-                    VIRTIO_NET_F_RSS, false),
-    DEFINE_PROP_BIT64("hash", VirtIONet, host_features,
-                    VIRTIO_NET_F_HASH_REPORT, false),
-    DEFINE_PROP_BIT64("guest_rsc_ext", VirtIONet, host_features,
-                    VIRTIO_NET_F_RSC_EXT, false),
+    DEFINE_VIRTIO_FEATURE_BIT64("csum", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_CSUM, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("guest_csum", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_GUEST_CSUM, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("gso", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_GSO, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("guest_tso4", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_GUEST_TSO4, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("guest_tso6", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_GUEST_TSO6, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("guest_ecn", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_GUEST_ECN, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("guest_ufo", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_GUEST_UFO, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("guest_announce", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_GUEST_ANNOUNCE, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("host_tso4", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_HOST_TSO4, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("host_tso6", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_HOST_TSO6, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("host_ecn", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_HOST_ECN, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("host_ufo", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_HOST_UFO, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("mrg_rxbuf", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_MRG_RXBUF, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("status", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_STATUS, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("ctrl_vq", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_CTRL_VQ, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("ctrl_rx", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_CTRL_RX, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("ctrl_vlan", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_CTRL_VLAN, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("ctrl_rx_extra", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_CTRL_RX_EXTRA, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("ctrl_mac_addr", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_CTRL_MAC_ADDR, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("ctrl_guest_offloads", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_CTRL_GUEST_OFFLOADS, true),
+    DEFINE_VIRTIO_FEATURE_BIT64("mq", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_MQ, false),
+    DEFINE_VIRTIO_FEATURE_BIT64("rss", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_RSS, false),
+    DEFINE_VIRTIO_FEATURE_BIT64("hash", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_HASH_REPORT, false),
+    DEFINE_VIRTIO_FEATURE_BIT64("guest_rsc_ext", VirtIONet, host_features,
+                                parent_obj.guest_features,
+                                VIRTIO_NET_F_RSC_EXT, false),
     DEFINE_PROP_UINT32("rsc_interval", VirtIONet, rsc_timeout,
                        VIRTIO_NET_RSC_DEFAULT_INTERVAL),
     DEFINE_NIC_PROPERTIES(VirtIONet, nic_conf),