diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-10 17:14:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-10 17:14:35 +0100 |
| commit | d08306dc42ea599ffcf8aad056fa9c23acfbe230 (patch) | |
| tree | 485f28174714509d48d0a928a3b65871b4e13569 /hw/net/vhost_net.c | |
| parent | 4b3e5c06a15298d870e81c2d3a5a16dc2a93f5cc (diff) | |
| parent | 28ed5ef16384f12500abd3647973ee21b03cbe23 (diff) | |
| download | focaccia-qemu-d08306dc42ea599ffcf8aad056fa9c23acfbe230.tar.gz focaccia-qemu-d08306dc42ea599ffcf8aad056fa9c23acfbe230.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio/vhost: fixes some bugfixes for virtio/vhost Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Wed 10 Aug 2016 16:16:22 BST # gpg: using RSA key 0x281F0DB8D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * remotes/mst/tags/for_upstream: vhost-user: Attempt to fix a race with set_mem_table. vhost-user: Introduce a new protocol feature REPLY_ACK. vhost: check for vhost_ops before using. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/vhost_net.c')
| -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 dc61dc1c5f..f2d49ad7e7 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -428,7 +428,7 @@ int vhost_set_vring_enable(NetClientState *nc, int enable) nc->vring_enable = enable; - if (vhost_ops->vhost_set_vring_enable) { + if (vhost_ops && vhost_ops->vhost_set_vring_enable) { return vhost_ops->vhost_set_vring_enable(&net->dev, enable); } |