aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-06-06 18:45:06 +0200
committerMichael S. Tsirkin <mst@redhat.com>2016-06-17 03:28:03 +0300
commitbfc6cf31ce12649b32dae0430fcbdb456fe6faf8 (patch)
tree813fa0191e598c7acd134fac9095c486d5454e5e /hw
parenta463215b087c41d7ca94e51aa347cde523831873 (diff)
downloadqemu-bfc6cf31ce12649b32dae0430fcbdb456fe6faf8.zip
qemu-bfc6cf31ce12649b32dae0430fcbdb456fe6faf8.tar.gz
qemu-bfc6cf31ce12649b32dae0430fcbdb456fe6faf8.tar.bz2
vhost-net: save & restore vring enable state
A driver may change the vring enable state at run time but vhost-user backend may not be present (a contrived example is when the backend is disconnected and the device is reconfigured after driver rebinding) Restore the vring state when the vhost-user backend is started, so it can process the ring. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Tested-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Reviewed-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Reviewed-by: Victor Kaplansky <victork@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/net/vhost_net.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index b28881f..50f4dcd 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -329,6 +329,15 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
if (r < 0) {
goto err_start;
}
+
+ if (ncs[i].peer->vring_enable) {
+ /* restore vring enable state */
+ r = vhost_set_vring_enable(ncs[i].peer, ncs[i].peer->vring_enable);
+
+ if (r < 0) {
+ goto err_start;
+ }
+ }
}
return 0;
@@ -422,6 +431,8 @@ int vhost_set_vring_enable(NetClientState *nc, int enable)
VHostNetState *net = get_vhost_net(nc);
const VhostOps *vhost_ops;
+ nc->vring_enable = enable;
+
if (!net) {
return 0;
}