diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-07 10:29:05 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-07 10:29:05 +0100 |
| commit | 5563168c530e2cde8e000ee7aa4afc0ea4d0b42e (patch) | |
| tree | 683f9339d73eb1f1480672c2586e46deddbeab7e /hw/net | |
| parent | 91d35509903464c7f4b9ed56be223d7370d3597c (diff) | |
| parent | 69e87b32680a41d9761191443587c595b6f5fc3f (diff) | |
| download | focaccia-qemu-5563168c530e2cde8e000ee7aa4afc0ea4d0b42e.tar.gz focaccia-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 'hw/net')
| -rw-r--r-- | hw/net/vhost_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 50f4dcd655..11fabc0b0a 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -172,7 +172,7 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) } r = vhost_dev_init(&net->dev, options->opaque, - options->backend_type); + options->backend_type, options->busyloop_timeout); if (r < 0) { goto fail; } |