d9b33018a0
This reverts commit46d4d36d0b. The reverted commit changed to emit warnings instead of errors when vhost is requested but vhost initialization fails if vhostforce option is not set. However, vhostforce is not meant to ignore vhost errors. It was once introduced as an option to commit5430a28fe4("vhost: force vhost off for non-MSI guests") to force enabling vhost for non-MSI guests, which will have worse performance with vhost. The option was deprecated with commit1e7398a140("vhost: enable vhost without without MSI-X") and changed to behave identical with the vhost option for compatibility. Worse, commitbf769f742c("virtio: del net client if net_init_tap_one failed") changed to delete the client when vhost fails even when the failure only results in a warning. The leads to an assertion failure for the -netdev command line option. The reverted commit was intended to avoid that the vhost initialization failure won't result in a corrupted netdev. This problem should have been fixed by deleting netdev when the initialization fails instead of ignoring the failure with an arbitrary option. Fortunately, commitbf769f742c("virtio: del net client if net_init_tap_one failed"), mentioned earlier, implements this behavior. Restore the correct semantics and fix the assertion failure for the -netdev command line option by reverting the problematic commit. Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
57 lines
2.0 KiB
C
57 lines
2.0 KiB
C
#ifndef VHOST_NET_H
|
|
#define VHOST_NET_H
|
|
|
|
#include "net/net.h"
|
|
#include "hw/virtio/vhost-backend.h"
|
|
|
|
struct vhost_net;
|
|
typedef struct vhost_net VHostNetState;
|
|
|
|
typedef struct VhostNetOptions {
|
|
VhostBackendType backend_type;
|
|
NetClientState *net_backend;
|
|
uint32_t busyloop_timeout;
|
|
unsigned int nvqs;
|
|
void *opaque;
|
|
} VhostNetOptions;
|
|
|
|
uint64_t vhost_net_get_max_queues(VHostNetState *net);
|
|
struct vhost_net *vhost_net_init(VhostNetOptions *options);
|
|
|
|
int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
|
|
int data_queue_pairs, int cvq);
|
|
void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs,
|
|
int data_queue_pairs, int cvq);
|
|
|
|
void vhost_net_cleanup(VHostNetState *net);
|
|
|
|
uint64_t vhost_net_get_features(VHostNetState *net, uint64_t features);
|
|
void vhost_net_ack_features(VHostNetState *net, uint64_t features);
|
|
|
|
int vhost_net_get_config(struct vhost_net *net, uint8_t *config,
|
|
uint32_t config_len);
|
|
|
|
int vhost_net_set_config(struct vhost_net *net, const uint8_t *data,
|
|
uint32_t offset, uint32_t size, uint32_t flags);
|
|
bool vhost_net_virtqueue_pending(VHostNetState *net, int n);
|
|
void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev,
|
|
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);
|
|
VHostNetState *get_vhost_net(NetClientState *nc);
|
|
|
|
int vhost_set_vring_enable(NetClientState * nc, int enable);
|
|
|
|
uint64_t vhost_net_get_acked_features(VHostNetState *net);
|
|
|
|
int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu);
|
|
|
|
void vhost_net_virtqueue_reset(VirtIODevice *vdev, NetClientState *nc,
|
|
int vq_index);
|
|
int vhost_net_virtqueue_restart(VirtIODevice *vdev, NetClientState *nc,
|
|
int vq_index);
|
|
|
|
void vhost_net_save_acked_features(NetClientState *nc);
|
|
#endif
|