[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 13/20] Add mandatory_features to vhost_dev
From: |
Antonios Motakis |
Subject: |
[Qemu-devel] [PATCH v9 13/20] Add mandatory_features to vhost_dev |
Date: |
Tue, 4 Mar 2014 19:22:56 +0100 |
This will be used in a following patch to ensure that a vhost-user
client reconnecting to QEMU supports the features that were exposed
by the first client that initiated the virtio-net session.
Signed-off-by: Antonios Motakis <address@hidden>
Signed-off-by: Nikolay Nikolaev <address@hidden>
---
hw/net/vhost_net.c | 10 ++++++++++
include/hw/virtio/vhost.h | 1 +
include/net/vhost_net.h | 2 ++
3 files changed, 13 insertions(+)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 0fb4fa5..38e1e8a 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -80,6 +80,11 @@ void vhost_net_ack_features(struct vhost_net *net, unsigned
features)
}
}
+unsigned long long vhost_net_features(VHostNetState *net)
+{
+ return net->dev.features;
+}
+
static int vhost_net_get_fd(NetClientState *backend)
{
switch (backend->info->type) {
@@ -112,6 +117,7 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)
net->dev.nvqs = 2;
net->dev.vqs = net->vqs;
+ net->dev.mandatory_features = options->mandatory_features;
r = vhost_dev_init(&net->dev, options->opaque,
options->force);
@@ -347,6 +353,10 @@ unsigned vhost_net_get_features(struct vhost_net *net,
unsigned features)
void vhost_net_ack_features(struct vhost_net *net, unsigned features)
{
}
+unsigned long long vhost_net_features(struct vhost_net *net)
+{
+ return 0;
+}
bool vhost_net_virtqueue_pending(VHostNetState *net, int idx)
{
diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index 97641b6..0068d40 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -41,6 +41,7 @@ struct vhost_dev {
unsigned long long features;
unsigned long long acked_features;
unsigned long long backend_features;
+ unsigned long long mandatory_features;
bool started;
bool log_enabled;
vhost_log_chunk_t *log;
diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h
index 2067ee2..b39bb45 100644
--- a/include/net/vhost_net.h
+++ b/include/net/vhost_net.h
@@ -10,6 +10,7 @@ typedef struct VhostNetOptions {
NetClientState *net_backend;
void *opaque;
bool force;
+ unsigned long long mandatory_features;
} VhostNetOptions;
struct vhost_net *vhost_net_init(VhostNetOptions *options);
@@ -22,6 +23,7 @@ void vhost_net_cleanup(VHostNetState *net);
unsigned vhost_net_get_features(VHostNetState *net, unsigned features);
void vhost_net_ack_features(VHostNetState *net, unsigned features);
+unsigned long long vhost_net_features(VHostNetState *net);
bool vhost_net_virtqueue_pending(VHostNetState *net, int n);
void vhost_net_virtqueue_mask(VHostNetState *net, VirtIODevice *dev,
--
1.8.3.2
- [Qemu-devel] [PATCH v9 17/20] Add the vhost-user netdev backend to the command line, (continued)
- [Qemu-devel] [PATCH v9 17/20] Add the vhost-user netdev backend to the command line, Antonios Motakis, 2014/03/04
- [Qemu-devel] [PATCH v9 19/20] libqemustub: add stubs to be able to use qemu-char.c, Antonios Motakis, 2014/03/04
- [Qemu-devel] [PATCH v9 20/20] Add qtest for vhost-user, Antonios Motakis, 2014/03/04
- [Qemu-devel] [PATCH v9 02/20] Add kvm_eventfds_enabled function, Antonios Motakis, 2014/03/04
- [Qemu-devel] [PATCH v9 09/20] Add new virtio API virtio_queue_get_avail_idx, Antonios Motakis, 2014/03/04
- [Qemu-devel] [PATCH v9 16/20] Add new vhost-user netdev backend, Antonios Motakis, 2014/03/04
- [Qemu-devel] [PATCH v9 15/20] Add vhost-user as a vhost backend., Antonios Motakis, 2014/03/04
- [Qemu-devel] [PATCH v9 11/20] vhost_net_init will use VhostNetOptions to get all its arguments, Antonios Motakis, 2014/03/04
- [Qemu-devel] [PATCH v9 13/20] Add mandatory_features to vhost_dev,
Antonios Motakis <=
- [Qemu-devel] [PATCH v9 18/20] Add vhost-user protocol documentation, Antonios Motakis, 2014/03/04
- [Qemu-devel] [PATCH v9 04/20] Add chardev API qemu_chr_fe_set_msgfds, Antonios Motakis, 2014/03/04
- [Qemu-devel] [PATCH v9 14/20] Add vhost-backend and VhostBackendType, Antonios Motakis, 2014/03/04