diff options
| author | Peter Maydell | 2016-07-07 11:29:05 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-07-07 11:29:05 +0200 |
| commit | 5563168c530e2cde8e000ee7aa4afc0ea4d0b42e (patch) | |
| tree | 683f9339d73eb1f1480672c2586e46deddbeab7e /net/vhost-user.c | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20160706' into staging (diff) | |
| parent | tap: vhost busy polling support (diff) | |
| download | qemu-5563168c530e2cde8e000ee7aa4afc0ea4d0b42e.tar.gz qemu-5563168c530e2cde8e000ee7aa4afc0ea4d0b42e.tar.xz qemu-5563168c530e2cde8e000ee7aa4afc0ea4d0b42e.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Thu 07 Jul 2016 07:29:44 BST
# gpg: using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
tap: vhost busy polling support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/vhost-user.c')
| -rw-r--r-- | net/vhost-user.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/vhost-user.c b/net/vhost-user.c index 92f4cfd1b1..a88dfe0655 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -91,6 +91,7 @@ static int vhost_user_start(int queues, NetClientState *ncs[]) options.net_backend = ncs[i]; options.opaque = s->chr; + options.busyloop_timeout = 0; s->vhost_net = vhost_net_init(&options); if (!s->vhost_net) { error_report("failed to init vhost_net for queue %d", i); |