From patchwork Tue Jun 10 14:17:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 357951 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1D10714007E for ; Wed, 11 Jun 2014 00:17:44 +1000 (EST) Received: from localhost ([::1]:40151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WuMrt-0007ta-Nw for incoming@patchwork.ozlabs.org; Tue, 10 Jun 2014 10:17:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WuMrY-0007cX-G0 for qemu-devel@nongnu.org; Tue, 10 Jun 2014 10:17:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WuMrR-0005tG-Oq for qemu-devel@nongnu.org; Tue, 10 Jun 2014 10:17:20 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:36552) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WuMrR-0005t6-Iv for qemu-devel@nongnu.org; Tue, 10 Jun 2014 10:17:13 -0400 Received: by mail-wg0-f44.google.com with SMTP id x13so4666858wgg.15 for ; Tue, 10 Jun 2014 07:17:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:from:to:cc:date:message-id:user-agent :mime-version:content-type:content-transfer-encoding; bh=JxD5gCSONx1iQ1p1Dv6EJfw4z/MlficXGnDhpazpXoE=; b=RYyINtcdyww/Hg8Jny5PVdVYzsBLZBbA4N7X79dUFjZSXbZVBXahGNSG+MeGuiy8as Gxz82/4bRs6O/bRqta9RAXxVdyauerNDJ+PRBDkBmIYEoT8MLSKzynADxCO9GmzRXt0H oieMPE1ZY1Z6XR0EpQAVWjNITRfOFIae/TiDai90krtEsIyQBDa6rNSK51ChmD8HuQMd OpSXMm7P23w3j1Qrfu8jpU7Dg85CnUfTPVigzRJvoqtkSy4I3Rrm3nnt9nhRM/q9WMbQ zU2YjrvuBlBV5u1L6cTpJiVYTC/Hghv/YXXugcfi4KfWK6WVEw8Tut4zAQEbpn6egwe2 HsrQ== X-Gm-Message-State: ALoCoQnJWjvOOrWmCsffAcaOXvTYFwzfWcKoIkflFHZ0MLHF/sUduyDwwV2WAUnPTtKodEsHJt5z X-Received: by 10.15.45.133 with SMTP id b5mr14682eew.44.1402409832863; Tue, 10 Jun 2014 07:17:12 -0700 (PDT) Received: from [0.0.14.236] ([82.146.27.14]) by mx.google.com with ESMTPSA id l49sm52495274eef.27.2014.06.10.07.17.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jun 2014 07:17:12 -0700 (PDT) From: Nikolay Nikolaev To: snabb-devel@googlegroups.com, qemu-devel@nongnu.org Date: Tue, 10 Jun 2014 17:17:05 +0300 Message-ID: <20140610141631.27328.63686.stgit@3820> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.44 Cc: a.motakis@virtualopensystems.com, luke@snabb.co, tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com, mst@redhat.com Subject: [Qemu-devel] [PATCH v10-fix 1/1] fixup! Add the vhost-user netdev backend to the command line X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fixes remarks: - rever vhost-force to vhostforce (consistent with tap) - removed has_unsupported member from VhostUserChardevProps - removed double error reporting when parsing chardev options Signed-off-by: Nikolay Nikolaev Reviewed-by: Eric Blake --- net/vhost-user.c | 18 ++++++------------ qapi-schema.json | 4 ++-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/net/vhost-user.c b/net/vhost-user.c index 32b78fb..24e050c 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -26,7 +26,6 @@ typedef struct VhostUserChardevProps { bool is_socket; bool is_unix; bool is_server; - bool has_unsupported; } VhostUserChardevProps; VHostNetState *vhost_user_get_vhost_net(NetClientState *nc) @@ -172,7 +171,6 @@ static int net_vhost_chardev_opts(const char *name, const char *value, error_report("vhost-user does not support a chardev" " with the following option:\n %s = %s", name, value); - props->has_unsupported = true; return -1; } return 0; @@ -190,7 +188,9 @@ static CharDriverState *net_vhost_parse_chardev(const NetdevVhostUserOptions *op /* inspect chardev opts */ memset(&props, 0, sizeof(props)); - qemu_opt_foreach(chr->opts, net_vhost_chardev_opts, &props, false); + if (qemu_opt_foreach(chr->opts, net_vhost_chardev_opts, &props, true) != 0) { + return NULL; + } if (!props.is_socket || !props.is_unix) { error_report("chardev \"%s\" is not a unix socket", @@ -198,12 +198,6 @@ static CharDriverState *net_vhost_parse_chardev(const NetdevVhostUserOptions *op return NULL; } - if (props.has_unsupported) { - error_report("chardev \"%s\" has an unsupported option", - opts->chardev); - return NULL; - } - qemu_chr_fe_claim_no_fail(chr); return chr; @@ -253,9 +247,9 @@ int net_init_vhost_user(const NetClientOptions *opts, const char *name, return -1; } - /* vhost-force for non-MSIX */ - if (vhost_user_opts->has_vhost_force) { - vhostforce = vhost_user_opts->vhost_force; + /* vhostforce for non-MSIX */ + if (vhost_user_opts->has_vhostforce) { + vhostforce = vhost_user_opts->vhostforce; } else { vhostforce = false; } diff --git a/qapi-schema.json b/qapi-schema.json index f062ce9..0837fc5 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3273,14 +3273,14 @@ # # @chardev: name of a unix socket chardev # -# @vhost-force: #optional vhost on for non-MSIX virtio guests (default: false). +# @vhostforce: #optional vhost on for non-MSIX virtio guests (default: false). # # Since 2.1 ## { 'type': 'NetdevVhostUserOptions', 'data': { 'chardev': 'str', - '*vhost-force': 'bool' } } + '*vhostforce': 'bool' } } ## # @NetClientOptions