You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
69 lines
2.5 KiB
69 lines
2.5 KiB
2 years ago
|
From effd0ed379deb43bb850f1aeff24fa85935d7f52 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
|
||
|
|
Date: Tue, 23 Aug 2022 20:30:31 +0200
|
||
|
|
Subject: [PATCH 16/23] vhost_net: Add NetClientInfo stop callback
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Eugenio Pérez <eperezma@redhat.com>
|
||
|
|
RH-MergeRequest: 116: vdpa: Restore device state on destination
|
||
|
|
RH-Bugzilla: 2114060
|
||
|
|
RH-Acked-by: Cindy Lu <lulu@redhat.com>
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Commit: [15/21] 9f8a3e9bfb0d21fa0479f54a7a17cb738aa46359 (eperezmartin/qemu-kvm)
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2114060
|
||
|
|
Upstream status: git@github.com:jasowang/qemu.git net-next
|
||
|
|
|
||
|
|
Used by the backend to perform actions after the device is stopped.
|
||
|
|
|
||
|
|
In particular, vdpa net use it to unmap CVQ buffers to the device,
|
||
|
|
cleaning the actions performed in prepare().
|
||
|
|
|
||
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
||
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
(cherry picked from commit c6544e2331d721627fa7356da3592bcb46340f1b)
|
||
|
|
---
|
||
|
|
hw/net/vhost_net.c | 3 +++
|
||
|
|
include/net/net.h | 2 ++
|
||
|
|
2 files changed, 5 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
|
||
|
|
index 1005f9d8e6..275ece5324 100644
|
||
|
|
--- a/hw/net/vhost_net.c
|
||
|
|
+++ b/hw/net/vhost_net.c
|
||
|
|
@@ -320,6 +320,9 @@ static void vhost_net_stop_one(struct vhost_net *net,
|
||
|
|
net->nc->info->poll(net->nc, true);
|
||
|
|
}
|
||
|
|
vhost_dev_stop(&net->dev, dev);
|
||
|
|
+ if (net->nc->info->stop) {
|
||
|
|
+ net->nc->info->stop(net->nc);
|
||
|
|
+ }
|
||
|
|
vhost_dev_disable_notifiers(&net->dev, dev);
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/include/net/net.h b/include/net/net.h
|
||
|
|
index ad9e80083a..476ad45b9a 100644
|
||
|
|
--- a/include/net/net.h
|
||
|
|
+++ b/include/net/net.h
|
||
|
|
@@ -45,6 +45,7 @@ typedef struct NICConf {
|
||
|
|
typedef void (NetPoll)(NetClientState *, bool enable);
|
||
|
|
typedef bool (NetCanReceive)(NetClientState *);
|
||
|
|
typedef int (NetStart)(NetClientState *);
|
||
|
|
+typedef void (NetStop)(NetClientState *);
|
||
|
|
typedef ssize_t (NetReceive)(NetClientState *, const uint8_t *, size_t);
|
||
|
|
typedef ssize_t (NetReceiveIOV)(NetClientState *, const struct iovec *, int);
|
||
|
|
typedef void (NetCleanup) (NetClientState *);
|
||
|
|
@@ -73,6 +74,7 @@ typedef struct NetClientInfo {
|
||
|
|
NetReceiveIOV *receive_iov;
|
||
|
|
NetCanReceive *can_receive;
|
||
|
|
NetStart *start;
|
||
|
|
+ NetStop *stop;
|
||
|
|
NetCleanup *cleanup;
|
||
|
|
LinkStatusChanged *link_status_changed;
|
||
|
|
QueryRxFilter *query_rx_filter;
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|