29b115
From dffe24d5c1f5a4676e9d2a5bc032effd420b008f Mon Sep 17 00:00:00 2001
29b115
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
29b115
Date: Thu, 21 Jul 2022 15:38:55 +0200
29b115
Subject: [PATCH 08/32] virtio-net: Expose MAC_TABLE_ENTRIES
29b115
MIME-Version: 1.0
29b115
Content-Type: text/plain; charset=UTF-8
29b115
Content-Transfer-Encoding: 8bit
29b115
29b115
RH-Author: Eugenio Pérez <eperezma@redhat.com>
29b115
RH-MergeRequest: 108: Net Control Virtqueue shadow Support
29b115
RH-Commit: [8/27] 5c3b96215ddf853cafc594da47f57d7e157db4ee (eperezmartin/qemu-kvm)
29b115
RH-Bugzilla: 1939363
29b115
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
29b115
RH-Acked-by: Cindy Lu <lulu@redhat.com>
29b115
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
29b115
29b115
Bugzilla: https://bugzilla.redhat.com/1939363
29b115
29b115
Upstream Status: git://git.qemu.org/qemu.git
29b115
29b115
commit 6758c01f054c2a842d41d927d628b09f649d3254
29b115
Author: Eugenio Pérez <eperezma@redhat.com>
29b115
Date:   Wed Jul 20 08:59:27 2022 +0200
29b115
29b115
    virtio-net: Expose MAC_TABLE_ENTRIES
29b115
29b115
    vhost-vdpa control virtqueue needs to know the maximum entries supported
29b115
    by the virtio-net device, so we know if it is possible to apply the
29b115
    filter.
29b115
29b115
    Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
29b115
    Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
29b115
    Signed-off-by: Jason Wang <jasowang@redhat.com>
29b115
29b115
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
29b115
---
29b115
 hw/net/virtio-net.c            | 1 -
29b115
 include/hw/virtio/virtio-net.h | 3 +++
29b115
 2 files changed, 3 insertions(+), 1 deletion(-)
29b115
29b115
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
29b115
index 633de61513..2a127f0a3b 100644
29b115
--- a/hw/net/virtio-net.c
29b115
+++ b/hw/net/virtio-net.c
29b115
@@ -49,7 +49,6 @@
29b115
 
29b115
 #define VIRTIO_NET_VM_VERSION    11
29b115
 
29b115
-#define MAC_TABLE_ENTRIES    64
29b115
 #define MAX_VLAN    (1 << 12)   /* Per 802.1Q definition */
29b115
 
29b115
 /* previously fixed value */
29b115
diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h
29b115
index eb87032627..cce1c554f7 100644
29b115
--- a/include/hw/virtio/virtio-net.h
29b115
+++ b/include/hw/virtio/virtio-net.h
29b115
@@ -35,6 +35,9 @@ OBJECT_DECLARE_SIMPLE_TYPE(VirtIONet, VIRTIO_NET)
29b115
  * and latency. */
29b115
 #define TX_BURST 256
29b115
 
29b115
+/* Maximum VIRTIO_NET_CTRL_MAC_TABLE_SET unicast + multicast entries. */
29b115
+#define MAC_TABLE_ENTRIES    64
29b115
+
29b115
 typedef struct virtio_net_conf
29b115
 {
29b115
     uint32_t txtimer;
29b115
-- 
29b115
2.31.1
29b115