mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "virtio-net: add support for configure interrupt"

Browse Source 
This reverts commit 497679d510.

Fixes: 497679d510 ("virtio-net: add support for configure interrupt")
Cc: "Cindy Lu" <lulu@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2022-01-10 00:46:16 -05:00
parent 99478e5941
commit b3ef6664b7
4 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/net/vhost_net-stub.c
View File

@ -101,12 +101,3 @@ int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu)
{ {
return 0; return 0;
} }
bool vhost_net_config_pending(VHostNetState *net)
{
return false;
}
void vhost_net_config_mask(VHostNetState *net, VirtIODevice *dev, bool mask)
{
}

9
hw/net/vhost_net.c
View File

@ -457,15 +457,6 @@ void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev,
vhost_virtqueue_mask(&net->dev, dev, idx, mask); 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 *get_vhost_net(NetClientState *nc)
{ {
VHostNetState *vhost_net = 0; VHostNetState *vhost_net = 0;

4
hw/net/virtio-net.c
View File

@ -3169,7 +3169,7 @@ static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx)
NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx)); NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx));
assert(n->vhost_started); assert(n->vhost_started);
if (idx == VIRTIO_CONFIG_IRQ_IDX) { if (idx == VIRTIO_CONFIG_IRQ_IDX) {
return vhost_net_config_pending(get_vhost_net(nc->peer)); return false;
} }
return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx); return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx);
} }
@ -3181,9 +3181,9 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx,
NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx)); NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx));
assert(n->vhost_started); assert(n->vhost_started);
if (idx == VIRTIO_CONFIG_IRQ_IDX) { if (idx == VIRTIO_CONFIG_IRQ_IDX) {
vhost_net_config_mask(get_vhost_net(nc->peer), vdev, mask);
return; return;
} }
vhost_net_virtqueue_mask(get_vhost_net(nc->peer), vdev, idx, mask); vhost_net_virtqueue_mask(get_vhost_net(nc->peer), vdev, idx, mask);
} }

2
include/net/vhost_net.h
View File

@ -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); bool vhost_net_virtqueue_pending(VHostNetState *net, int n);
void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev, void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev,
int idx, bool mask); 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); int vhost_net_notify_migration_done(VHostNetState *net, char* mac_addr);
VHostNetState *get_vhost_net(NetClientState *nc); VHostNetState *get_vhost_net(NetClientState *nc);