From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <stephen@networkplumber.org> Received: from mail-qc0-f178.google.com (mail-qc0-f178.google.com [209.85.216.178]) by dpdk.org (Postfix) with ESMTP id 95ED2C368 for <dev@dpdk.org>; Thu, 4 Jun 2015 16:43:33 +0200 (CEST) Received: by qcmi9 with SMTP id i9so18493476qcm.0 for <dev@dpdk.org>; Thu, 04 Jun 2015 07:43:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=l2EsmQdnKtzX0GqbWUi2lTD5YR91Of70jBKEM3r+piQ=; b=ish+sxIBV65ZH5/8BUsve2DU2+a19uy1eFwR0q6IB0Zl+WxRTP9CqpsP4KINvYvRDu ism2pPBpiMGW1+ToXXl+s+yOkm7B0Qbg8Ro0CANlo5OWMPWTRPyxRi69UIqjOH1dxlMx rVwqFuHvSM7vg8jp3RpDsBfT7Bkb1d46ZD4Vy8EGV9Pyi4Nk/FUkc/ix9+iHOpN/NZxA sm/bugI5sY8Jbt1pphPVjrw7KAuxViiePm+IBgwWPTcfNJQGl27kSzf3P/P3HI+GGokG 1rhGae/e1If8xg5DMi5L7gxztumbOPy6vR+GTGCdi8dLwiFhJV/ymw6JNuC4l+6zpY1f evMA== X-Gm-Message-State: ALoCoQmb1fmdWbI4uxJaIwchD5hKLcXHJxdNPlQsWOv/tPosdmCmI6wmUoQVkD3IcfinbgJU0xwY X-Received: by 10.140.101.140 with SMTP id u12mr42553485qge.48.1433429013171; Thu, 04 Jun 2015 07:43:33 -0700 (PDT) Received: from urahara.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155]) by mx.google.com with ESMTPSA id d24sm2469320qkh.45.2015.06.04.07.43.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Jun 2015 07:43:32 -0700 (PDT) From: Stephen Hemminger <stephen@networkplumber.org> To: dev@dpdk.org Date: Thu, 4 Jun 2015 07:43:22 -0700 Message-Id: <1433429007-4640-5-git-send-email-stephen@networkplumber.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433429007-4640-1-git-send-email-stephen@networkplumber.org> References: <1433429007-4640-1-git-send-email-stephen@networkplumber.org> Cc: Stephen Hemminger <shemming@brocade.com> Subject: [dpdk-dev] [PATCH 4/9] vhost: fix trailing whitespace X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK <dev.dpdk.org> List-Unsubscribe: <http://dpdk.org/ml/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://dpdk.org/ml/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <http://dpdk.org/ml/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> X-List-Received-Date: Thu, 04 Jun 2015 14:43:34 -0000 From: Stephen Hemminger <shemming@brocade.com> Signed-off-by: Stephen Hemminger <stephen@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