74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
|
From d91546b3bc3dd147b6327a4d8c5b523104a09aa6 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:35 +0200
|
||
|
|
Subject: [PATCH 17/29] vhost_net: add NetClientState->load() callback
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
RH-MergeRequest: 117: vDPA SVQ Multiqueue support
|
||
|
|
RH-Jira: RHELX-57
|
||
|
|
RH-Acked-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
RH-Acked-by: Cindy Lu <lulu@redhat.com>
|
||
|
|
RH-Acked-by: Eugenio Pérez <eperezma@redhat.com>
|
||
|
|
RH-Commit: [17/25] de71f2e8fc7b25f5197101703fbb5ff054ada984 (redhat/centos-stream/src/qemu-kvm)
|
||
|
|
|
||
|
|
It allows per-net client operations right after device's successful
|
||
|
|
start. In particular, to load the device status.
|
||
|
|
|
||
|
|
Vhost-vdpa net will use it to add the CVQ buffers to restore the device
|
||
|
|
status.
|
||
|
|
|
||
|
|
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 539573c317dc0b8d50a128db60550f2f2898d2fc)
|
||
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
---
|
||
|
|
hw/net/vhost_net.c | 7 +++++++
|
||
|
|
include/net/net.h | 2 ++
|
||
|
|
2 files changed, 9 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
|
||
|
|
index 9d4b334453..d28f8b974b 100644
|
||
|
|
--- a/hw/net/vhost_net.c
|
||
|
|
+++ b/hw/net/vhost_net.c
|
||
|
|
@@ -281,6 +281,13 @@ static int vhost_net_start_one(struct vhost_net *net,
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ if (net->nc->info->load) {
|
||
|
|
+ r = net->nc->info->load(net->nc);
|
||
|
|
+ if (r < 0) {
|
||
|
|
+ goto fail;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
return 0;
|
||
|
|
fail:
|
||
|
|
file.fd = -1;
|
||
|
|
diff --git a/include/net/net.h b/include/net/net.h
|
||
|
|
index 476ad45b9a..81d0b21def 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 int (NetLoad)(NetClientState *);
|
||
|
|
typedef void (NetStop)(NetClientState *);
|
||
|
|
typedef ssize_t (NetReceive)(NetClientState *, const uint8_t *, size_t);
|
||
|
|
typedef ssize_t (NetReceiveIOV)(NetClientState *, const struct iovec *, int);
|
||
|
|
@@ -74,6 +75,7 @@ typedef struct NetClientInfo {
|
||
|
|
NetReceiveIOV *receive_iov;
|
||
|
|
NetCanReceive *can_receive;
|
||
|
|
NetStart *start;
|
||
|
|
+ NetLoad *load;
|
||
|
|
NetStop *stop;
|
||
|
|
NetCleanup *cleanup;
|
||
|
|
LinkStatusChanged *link_status_changed;
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|