diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2022-01-11 10:12:29 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-01-11 10:12:29 +0000 |
| commit | bf99e0ec9a51976868d7a8334620716df15fe7fe (patch) | |
| tree | b9c1d439a3b2ace523c9281870741ff8a4e7c1d5 /hw/net/virtio-net.c | |
| parent | de3f5223fa4cf8bfc5e3fe1fd495ddf468edcdf7 (diff) | |
| parent | a882b5712373171d3bd53cd82ddab4453ddef468 (diff) | |
| download | focaccia-qemu-bf99e0ec9a51976868d7a8334620716df15fe7fe.tar.gz focaccia-qemu-bf99e0ec9a51976868d7a8334620716df15fe7fe.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio: revert config interrupt changes Lots of fallout from config interrupt changes. Author wants to rework the patches. Let's revert quickly so others don't suffer meanwhile. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Mon 10 Jan 2022 21:03:44 GMT # gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469 # gpg: issuer "mst@redhat.com" # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full] # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [full] # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * remotes/mst/tags/for_upstream: Revert "virtio: introduce macro IRTIO_CONFIG_IRQ_IDX" Revert "virtio-pci: decouple notifier from interrupt process" Revert "virtio-pci: decouple the single vector from the interrupt process" Revert "vhost: introduce new VhostOps vhost_set_config_call" Revert "vhost-vdpa: add support for config interrupt" Revert "virtio: add support for configure interrupt" Revert "vhost: add support for configure interrupt" Revert "virtio-net: add support for configure interrupt" Revert "virtio-mmio: add support for configure interrupt" Revert "virtio-pci: add support for configure interrupt" Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
| -rw-r--r-- | hw/net/virtio-net.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 5806a50c8d..cf8ab0f8af 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -3168,9 +3168,6 @@ static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx) VirtIONet *n = VIRTIO_NET(vdev); NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx)); assert(n->vhost_started); - if (idx == VIRTIO_CONFIG_IRQ_IDX) { - return vhost_net_config_pending(get_vhost_net(nc->peer)); - } return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx); } @@ -3180,11 +3177,8 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx, VirtIONet *n = VIRTIO_NET(vdev); NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(idx)); assert(n->vhost_started); - 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); + vhost_net_virtqueue_mask(get_vhost_net(nc->peer), + vdev, idx, mask); } static void virtio_net_set_config_size(VirtIONet *n, uint64_t host_features) |