53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
|
From 4f6f9e62214a008523b054c82d663d14d82a2c86 Mon Sep 17 00:00:00 2001
|
||
|
|
From: fangyi <eric.fangyi@huawei.com>
|
||
|
|
Date: Wed, 22 Nov 2023 09:50:43 +0800
|
||
|
|
Subject: [PATCH] Revert "virtio-net: add support for configure interrupt"
|
||
|
|
|
||
|
|
This reverts commit 497679d51087090d5a22fd265d1b96cf92d49d9d.
|
||
|
|
|
||
|
|
Fixes: 497679d510 ("virtio-net: add support for configure interrupt")
|
||
|
|
Cc: "Cindy Lu" <lulu@redhat.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: fangyi <eric.fangyi@huawei.com>
|
||
|
|
---
|
||
|
|
hw/net/vhost_net.c | 9 ---------
|
||
|
|
include/net/vhost_net.h | 2 --
|
||
|
|
2 files changed, 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
|
||
|
|
index d5a92144bb..bea053a742 100644
|
||
|
|
--- a/hw/net/vhost_net.c
|
||
|
|
+++ b/hw/net/vhost_net.c
|
||
|
|
@@ -524,15 +524,6 @@ 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/include/net/vhost_net.h b/include/net/vhost_net.h
|
||
|
|
index 1844f0ed46..7bdbf484e4 100644
|
||
|
|
--- a/include/net/vhost_net.h
|
||
|
|
+++ b/include/net/vhost_net.h
|
||
|
|
@@ -39,8 +39,6 @@ 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
|
||
|
|
|