From: Stephen Hemminger <shemm...@brocade.com> Signed-off-by: Stephen Hemminger <stephen at networkplumber.org> --- lib/librte_vhost/libvirt/qemu-wrap.py | 13 ++++++------- lib/librte_vhost/vhost_rxtx.c | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/lib/librte_vhost/libvirt/qemu-wrap.py b/lib/librte_vhost/libvirt/qemu-wrap.py index e2d68a0..5096011 100755 --- a/lib/librte_vhost/libvirt/qemu-wrap.py +++ b/lib/librte_vhost/libvirt/qemu-wrap.py @@ -49,17 +49,17 @@ # # 3.a) Set the VM to use the launch script # -# Set the emulator path contained in the +# Set the emulator path contained in the # <emulator><emulator/> tags # -# e.g replace <emulator>/usr/bin/qemu-kvm<emulator/> +# e.g replace <emulator>/usr/bin/qemu-kvm<emulator/> # with <emulator>/usr/bin/qemu-wrap.py<emulator/> # # 3.b) Set the VM's device's to use vhost-net offload # # <interface type="network"> -# <model type="virtio"/> -# <driver name="vhost"/> +# <model type="virtio"/> +# <driver name="vhost"/> # <interface/> # # 4. Enable libvirt to access our userpace device file by adding it to @@ -229,7 +229,7 @@ def get_vhost_fd(): # flags onto the end ############################################# def modify_netdev_arg(arg): - + global fd_list vhost_in_use = 0 s = '' @@ -259,7 +259,7 @@ def modify_netdev_arg(arg): s+=opt - return s + return s ############################################# @@ -364,4 +364,3 @@ def main(): if __name__ == "__main__": main() - diff --git a/lib/librte_vhost/vhost_rxtx.c b/lib/librte_vhost/vhost_rxtx.c index 4809d32..2da4a02 100644 --- a/lib/librte_vhost/vhost_rxtx.c +++ b/lib/librte_vhost/vhost_rxtx.c @@ -615,7 +615,7 @@ rte_vhost_dequeue_burst(struct virtio_net *dev, uint16_t queue_id, if (unlikely(m == NULL)) { RTE_LOG(ERR, VHOST_DATA, "Failed to allocate memory for mbuf.\n"); - break; + break; } seg_offset = 0; seg_avail = m->buf_len - RTE_PKTMBUF_HEADROOM; -- 2.1.4