103 lines
3.4 KiB
Diff
103 lines
3.4 KiB
Diff
|
|
From e55e9f52865565415000834b4cacb741b0abb2d8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Cindy Lu <lulu@redhat.com>
|
||
|
|
Date: Thu, 22 Dec 2022 15:04:49 +0800
|
||
|
|
Subject: [PATCH] virtio-net: add support for configure interrupt
|
||
|
|
|
||
|
|
Add functions to support configure interrupt in virtio_net
|
||
|
|
Add the functions to support vhost_net_config_pending
|
||
|
|
and vhost_net_config_mask.
|
||
|
|
|
||
|
|
Signed-off-by: Cindy Lu <lulu@redhat.com>
|
||
|
|
Message-Id: <20221222070451.936503-9-lulu@redhat.com>
|
||
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: fangyi <eric.fangyi@huawei.com>
|
||
|
|
---
|
||
|
|
hw/net/vhost_net-stub.c | 9 +++++++++
|
||
|
|
hw/net/vhost_net.c | 9 +++++++++
|
||
|
|
hw/net/virtio-net.c | 4 ++--
|
||
|
|
include/net/vhost_net.h | 2 ++
|
||
|
|
4 files changed, 22 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/net/vhost_net-stub.c b/hw/net/vhost_net-stub.c
|
||
|
|
index 199b09952a..db171829b4 100644
|
||
|
|
--- a/hw/net/vhost_net-stub.c
|
||
|
|
+++ b/hw/net/vhost_net-stub.c
|
||
|
|
@@ -82,6 +82,15 @@ void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev,
|
||
|
|
{
|
||
|
|
}
|
||
|
|
|
||
|
|
+bool vhost_net_config_pending(VHostNetState *net)
|
||
|
|
+{
|
||
|
|
+ return false;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+void vhost_net_config_mask(VHostNetState *net, VirtIODevice *dev, bool mask)
|
||
|
|
+{
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
int vhost_net_notify_migration_done(struct vhost_net *net, char* mac_addr)
|
||
|
|
{
|
||
|
|
return -1;
|
||
|
|
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
|
||
|
|
index c950d7e2e8..d226dba83c 100644
|
||
|
|
--- a/hw/net/vhost_net.c
|
||
|
|
+++ b/hw/net/vhost_net.c
|
||
|
|
@@ -541,6 +541,15 @@ void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev,
|
||
|
|
vhost_virtqueue_mask(&net->dev, dev, idx, mask);
|
||
|
|
}
|
||
|
|
|
||
|
|
+bool vhost_net_config_pending(VHostNetState *net)
|
||
|
|
+{
|
||
|
|
+ return vhost_config_pending(&net->dev);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+void vhost_net_config_mask(VHostNetState *net, VirtIODevice *dev, bool mask)
|
||
|
|
+{
|
||
|
|
+ vhost_config_mask(&net->dev, dev, mask);
|
||
|
|
+}
|
||
|
|
VHostNetState *get_vhost_net(NetClientState *nc)
|
||
|
|
{
|
||
|
|
VHostNetState *vhost_net = 0;
|
||
|
|
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
||
|
|
index 304f501da5..bc26f5347a 100644
|
||
|
|
--- a/hw/net/virtio-net.c
|
||
|
|
+++ b/hw/net/virtio-net.c
|
||
|
|
@@ -3239,7 +3239,7 @@ static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx)
|
||
|
|
*/
|
||
|
|
|
||
|
|
if (idx == VIRTIO_CONFIG_IRQ_IDX) {
|
||
|
|
- return false;
|
||
|
|
+ return vhost_net_config_pending(get_vhost_net(nc->peer));
|
||
|
|
}
|
||
|
|
return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx);
|
||
|
|
}
|
||
|
|
@@ -3271,9 +3271,9 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx,
|
||
|
|
*/
|
||
|
|
|
||
|
|
if (idx == VIRTIO_CONFIG_IRQ_IDX) {
|
||
|
|
+ vhost_net_config_mask(get_vhost_net(nc->peer), vdev, mask);
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
-
|
||
|
|
vhost_net_virtqueue_mask(get_vhost_net(nc->peer), vdev, idx, mask);
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h
|
||
|
|
index 7bdbf484e4..1844f0ed46 100644
|
||
|
|
--- a/include/net/vhost_net.h
|
||
|
|
+++ b/include/net/vhost_net.h
|
||
|
|
@@ -39,6 +39,8 @@ int vhost_net_set_config(struct vhost_net *net, const uint8_t *data,
|
||
|
|
bool vhost_net_virtqueue_pending(VHostNetState *net, int n);
|
||
|
|
void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev,
|
||
|
|
int idx, bool mask);
|
||
|
|
+bool vhost_net_config_pending(VHostNetState *net);
|
||
|
|
+void vhost_net_config_mask(VHostNetState *net, VirtIODevice *dev, bool mask);
|
||
|
|
int vhost_net_notify_migration_done(VHostNetState *net, char* mac_addr);
|
||
|
|
VHostNetState *get_vhost_net(NetClientState *nc);
|
||
|
|
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|