[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 08/18] Refactor virtio-net to use generic get_vh
From: |
Nikolay Nikolaev |
Subject: |
[Qemu-devel] [PATCH v10 08/18] Refactor virtio-net to use generic get_vhost_net |
Date: |
Tue, 27 May 2014 15:05:08 +0300 |
User-agent: |
StGit/0.17.1-dirty |
This decouples virtio-net from the TAP netdev backend and allows support
for other backends to be implemented.
Signed-off-by: Antonios Motakis <address@hidden>
Signed-off-by: Nikolay Nikolaev <address@hidden>
---
hw/net/vhost_net.c | 30 +++++++++++++++++++++++++++---
hw/net/virtio-net.c | 29 ++++++++---------------------
include/net/vhost_net.h | 1 +
3 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index dcec0f7..0b45043 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -233,7 +233,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
}
for (i = 0; i < total_queues; i++) {
- r = vhost_net_start_one(tap_get_vhost_net(ncs[i].peer), dev, i * 2);
+ r = vhost_net_start_one(get_vhost_net(ncs[i].peer), dev, i * 2);
if (r < 0) {
goto err;
@@ -250,7 +250,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
err:
while (--i >= 0) {
- vhost_net_stop_one(tap_get_vhost_net(ncs[i].peer), dev);
+ vhost_net_stop_one(get_vhost_net(ncs[i].peer), dev);
}
return r;
}
@@ -271,7 +271,7 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs,
assert(r >= 0);
for (i = 0; i < total_queues; i++) {
- vhost_net_stop_one(tap_get_vhost_net(ncs[i].peer), dev);
+ vhost_net_stop_one(get_vhost_net(ncs[i].peer), dev);
}
}
@@ -291,6 +291,25 @@ void vhost_net_virtqueue_mask(VHostNetState *net,
VirtIODevice *dev,
{
vhost_virtqueue_mask(&net->dev, dev, idx, mask);
}
+
+VHostNetState *get_vhost_net(NetClientState *nc)
+{
+ VHostNetState *vhost_net = 0;
+
+ if (!nc) {
+ return 0;
+ }
+
+ switch (nc->info->type) {
+ case NET_CLIENT_OPTIONS_KIND_TAP:
+ vhost_net = tap_get_vhost_net(nc);
+ break;
+ default:
+ break;
+ }
+
+ return vhost_net;
+}
#else
struct vhost_net *vhost_net_init(NetClientState *backend, int devfd,
bool force)
@@ -337,4 +356,9 @@ void vhost_net_virtqueue_mask(VHostNetState *net,
VirtIODevice *dev,
int idx, bool mask)
{
}
+
+VHostNetState *get_vhost_net(NetClientState *nc)
+{
+ return 0;
+}
#endif
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 940a7cf..afd60a0 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -105,14 +105,7 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8_t
status)
NetClientState *nc = qemu_get_queue(n->nic);
int queues = n->multiqueue ? n->max_queues : 1;
- if (!nc->peer) {
- return;
- }
- if (nc->peer->info->type != NET_CLIENT_OPTIONS_KIND_TAP) {
- return;
- }
-
- if (!tap_get_vhost_net(nc->peer)) {
+ if (!get_vhost_net(nc->peer)) {
return;
}
@@ -122,7 +115,7 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8_t
status)
}
if (!n->vhost_started) {
int r;
- if (!vhost_net_query(tap_get_vhost_net(nc->peer), vdev)) {
+ if (!vhost_net_query(get_vhost_net(nc->peer), vdev)) {
return;
}
n->vhost_started = 1;
@@ -452,13 +445,10 @@ static uint32_t virtio_net_get_features(VirtIODevice
*vdev, uint32_t features)
features &= ~(0x1 << VIRTIO_NET_F_HOST_UFO);
}
- if (!nc->peer || nc->peer->info->type != NET_CLIENT_OPTIONS_KIND_TAP) {
- return features;
- }
- if (!tap_get_vhost_net(nc->peer)) {
+ if (!get_vhost_net(nc->peer)) {
return features;
}
- return vhost_net_get_features(tap_get_vhost_net(nc->peer), features);
+ return vhost_net_get_features(get_vhost_net(nc->peer), features);
}
static uint32_t virtio_net_bad_features(VirtIODevice *vdev)
@@ -522,13 +512,10 @@ static void virtio_net_set_features(VirtIODevice *vdev,
uint32_t features)
for (i = 0; i < n->max_queues; i++) {
NetClientState *nc = qemu_get_subqueue(n->nic, i);
- if (!nc->peer || nc->peer->info->type != NET_CLIENT_OPTIONS_KIND_TAP) {
- continue;
- }
- if (!tap_get_vhost_net(nc->peer)) {
+ if (!get_vhost_net(nc->peer)) {
continue;
}
- vhost_net_ack_features(tap_get_vhost_net(nc->peer), features);
+ vhost_net_ack_features(get_vhost_net(nc->peer), features);
}
if ((1 << VIRTIO_NET_F_CTRL_VLAN) & features) {
@@ -1476,7 +1463,7 @@ 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);
- return vhost_net_virtqueue_pending(tap_get_vhost_net(nc->peer), idx);
+ return vhost_net_virtqueue_pending(get_vhost_net(nc->peer), idx);
}
static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx,
@@ -1485,7 +1472,7 @@ 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);
- vhost_net_virtqueue_mask(tap_get_vhost_net(nc->peer),
+ vhost_net_virtqueue_mask(get_vhost_net(nc->peer),
vdev, idx, mask);
}
diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h
index 2d936bb..e2bd61c 100644
--- a/include/net/vhost_net.h
+++ b/include/net/vhost_net.h
@@ -20,4 +20,5 @@ void vhost_net_ack_features(VHostNetState *net, unsigned
features);
bool vhost_net_virtqueue_pending(VHostNetState *net, int n);
void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev,
int idx, bool mask);
+VHostNetState *get_vhost_net(NetClientState *nc);
#endif
- [Qemu-devel] [PATCH v10 00/18] Vhost and vhost-net support for userspace based backends, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 01/18] Add kvm_eventfds_enabled function, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 02/18] Add chardev API qemu_chr_fe_read_all, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 03/18] Add chardev API qemu_chr_fe_set_msgfds, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 04/18] Add chardev API qemu_chr_fe_get_msgfds, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 05/18] Add G_IO_HUP handler for socket chardev, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 06/18] vhost: add vhost_get_features and vhost_ack_features, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 07/18] vhost_net should call the poll callback only when it is set, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 08/18] Refactor virtio-net to use generic get_vhost_net,
Nikolay Nikolaev <=
- [Qemu-devel] [PATCH v10 09/18] vhost_net_init will use VhostNetOptions to get all its arguments, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 10/18] Add vhost_ops to vhost_dev struct and replace all relevant ioctls, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 12/18] Add vhost-user as a vhost backend., Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 13/18] vhost-net: vhost-user feature bits support, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 14/18] Add new vhost-user netdev backend, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 15/18] Add the vhost-user netdev backend to the command line, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 16/18] Add vhost-user protocol documentation, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 17/18] libqemustub: add stubs to be able to use qemu-char.c, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 18/18] Add qtest for vhost-user, Nikolay Nikolaev, 2014/05/27
- [Qemu-devel] [PATCH v10 11/18] Add vhost-backend and VhostBackendType, Nikolay Nikolaev, 2014/05/27