[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/51] virtio-net: add support for configure interrupt
From: |
Michael S. Tsirkin |
Subject: |
[PULL 22/51] virtio-net: add support for configure interrupt |
Date: |
Thu, 5 Jan 2023 04:15:26 -0500 |
From: Cindy Lu <lulu@redhat.com>
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>
---
include/net/vhost_net.h | 2 ++
hw/net/vhost_net-stub.c | 9 +++++++++
hw/net/vhost_net.c | 9 +++++++++
hw/net/virtio-net.c | 4 ++--
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h
index dfb13756cd..c37aba35e6 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);
diff --git a/hw/net/vhost_net-stub.c b/hw/net/vhost_net-stub.c
index 66ed5f0b98..72df6d757e 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 984b130e8f..c4eecc6f36 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -487,6 +487,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 0bfe454c23..f191e3037f 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -3332,7 +3332,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);
}
@@ -3364,9 +3364,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);
}
--
MST
- [PULL 13/51] vhost-user: Refactor the chr_closed_bh, (continued)
- [PULL 13/51] vhost-user: Refactor the chr_closed_bh, Michael S. Tsirkin, 2023/01/05
- [PULL 14/51] vhost-user: Fix the virtio features negotiation flaw, Michael S. Tsirkin, 2023/01/05
- [PULL 16/51] virtio-pci: decouple notifier from interrupt process, Michael S. Tsirkin, 2023/01/05
- [PULL 17/51] virtio-pci: decouple the single vector from the interrupt process, Michael S. Tsirkin, 2023/01/05
- [PULL 15/51] virtio: introduce macro VIRTIO_CONFIG_IRQ_IDX, Michael S. Tsirkin, 2023/01/05
- [PULL 18/51] vhost: introduce new VhostOps vhost_set_config_call, Michael S. Tsirkin, 2023/01/05
- [PULL 20/51] virtio: add support for configure interrupt, Michael S. Tsirkin, 2023/01/05
- [PULL 23/51] virtio-mmio: add support for configure interrupt, Michael S. Tsirkin, 2023/01/05
- [PULL 19/51] vhost-vdpa: add support for config interrupt, Michael S. Tsirkin, 2023/01/05
- [PULL 21/51] vhost: add support for configure interrupt, Michael S. Tsirkin, 2023/01/05
- [PULL 22/51] virtio-net: add support for configure interrupt,
Michael S. Tsirkin <=
- [PULL 24/51] virtio-pci: add support for configure interrupt, Michael S. Tsirkin, 2023/01/05
- [PULL 26/51] hw/virtio: Extract QMP QOM-specific functions to virtio-qmp.c, Michael S. Tsirkin, 2023/01/05
- [PULL 25/51] hw/virtio: Rename virtio_device_find() -> qmp_find_virtio_device(), Michael S. Tsirkin, 2023/01/05
- [PULL 27/51] include/hw/pci: Break inclusion loop pci_bridge.h and cxl.h, Michael S. Tsirkin, 2023/01/05
- [PULL 30/51] include/hw/pci: Clean up a few things checkpatch.pl would flag, Michael S. Tsirkin, 2023/01/05
- [PULL 29/51] include/hw/cxl: Include hw/cxl/*.h where needed, Michael S. Tsirkin, 2023/01/05
- [PULL 31/51] include/hw/pci: Split pci_device.h off pci.h, Michael S. Tsirkin, 2023/01/05
- [PULL 34/51] include/hw/virtio: Break inclusion loop, Michael S. Tsirkin, 2023/01/05
- [PULL 35/51] include: Include headers where needed, Michael S. Tsirkin, 2023/01/05
- [PULL 36/51] include: Don't include qemu/osdep.h, Michael S. Tsirkin, 2023/01/05