vhost: add vhost_net_set_backend()
Not all vhost-user backends support ops->vhost_net_set_backend(). It is a nicer to provide an assert/error than to crash trying to call. Furthermore, it improves a bit the code by hiding vhost_ops details. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
f6b8571041
commit
950d94ba06
|
@ -242,8 +242,7 @@ static int vhost_net_start_one(struct vhost_net *net,
|
||||||
qemu_set_fd_handler(net->backend, NULL, NULL, NULL);
|
qemu_set_fd_handler(net->backend, NULL, NULL, NULL);
|
||||||
file.fd = net->backend;
|
file.fd = net->backend;
|
||||||
for (file.index = 0; file.index < net->dev.nvqs; ++file.index) {
|
for (file.index = 0; file.index < net->dev.nvqs; ++file.index) {
|
||||||
const VhostOps *vhost_ops = net->dev.vhost_ops;
|
r = vhost_net_set_backend(&net->dev, &file);
|
||||||
r = vhost_ops->vhost_net_set_backend(&net->dev, &file);
|
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
r = -errno;
|
r = -errno;
|
||||||
goto fail;
|
goto fail;
|
||||||
|
@ -255,8 +254,7 @@ fail:
|
||||||
file.fd = -1;
|
file.fd = -1;
|
||||||
if (net->nc->info->type == NET_CLIENT_DRIVER_TAP) {
|
if (net->nc->info->type == NET_CLIENT_DRIVER_TAP) {
|
||||||
while (file.index-- > 0) {
|
while (file.index-- > 0) {
|
||||||
const VhostOps *vhost_ops = net->dev.vhost_ops;
|
int r = vhost_net_set_backend(&net->dev, &file);
|
||||||
int r = vhost_ops->vhost_net_set_backend(&net->dev, &file);
|
|
||||||
assert(r >= 0);
|
assert(r >= 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -277,8 +275,7 @@ static void vhost_net_stop_one(struct vhost_net *net,
|
||||||
|
|
||||||
if (net->nc->info->type == NET_CLIENT_DRIVER_TAP) {
|
if (net->nc->info->type == NET_CLIENT_DRIVER_TAP) {
|
||||||
for (file.index = 0; file.index < net->dev.nvqs; ++file.index) {
|
for (file.index = 0; file.index < net->dev.nvqs; ++file.index) {
|
||||||
const VhostOps *vhost_ops = net->dev.vhost_ops;
|
int r = vhost_net_set_backend(&net->dev, &file);
|
||||||
int r = vhost_ops->vhost_net_set_backend(&net->dev, &file);
|
|
||||||
assert(r >= 0);
|
assert(r >= 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1369,3 +1369,13 @@ void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev)
|
||||||
vhost_log_put(hdev, true);
|
vhost_log_put(hdev, true);
|
||||||
hdev->started = false;
|
hdev->started = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int vhost_net_set_backend(struct vhost_dev *hdev,
|
||||||
|
struct vhost_vring_file *file)
|
||||||
|
{
|
||||||
|
if (hdev->vhost_ops->vhost_net_set_backend) {
|
||||||
|
return hdev->vhost_ops->vhost_net_set_backend(hdev, file);
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
|
@ -86,4 +86,8 @@ uint64_t vhost_get_features(struct vhost_dev *hdev, const int *feature_bits,
|
||||||
void vhost_ack_features(struct vhost_dev *hdev, const int *feature_bits,
|
void vhost_ack_features(struct vhost_dev *hdev, const int *feature_bits,
|
||||||
uint64_t features);
|
uint64_t features);
|
||||||
bool vhost_has_free_slot(void);
|
bool vhost_has_free_slot(void);
|
||||||
|
|
||||||
|
int vhost_net_set_backend(struct vhost_dev *hdev,
|
||||||
|
struct vhost_vring_file *file);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue