From patchwork Mon Oct 19 04:29:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Yamamoto X-Patchwork-Id: 532128 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 583811401E7 for ; Mon, 19 Oct 2015 15:30:32 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 42D1F10981; Sun, 18 Oct 2015 21:29:59 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id D00EC10911 for ; Sun, 18 Oct 2015 21:29:56 -0700 (PDT) Received: from bar2.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id 5480042008E for ; Sun, 18 Oct 2015 22:29:56 -0600 (MDT) X-ASG-Debug-ID: 1445228995-03dc5361ee614e0001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar2.cudamail.com with ESMTP id JOU7tQcW5QulThDp (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 18 Oct 2015 22:29:55 -0600 (MDT) X-Barracuda-Envelope-From: yamamoto@midokura.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mail-pa0-f47.google.com) (209.85.220.47) by mx1-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 19 Oct 2015 04:29:55 -0000 Received-SPF: neutral (mx1-pf2.cudamail.com: 209.85.220.47 is neither permitted nor denied by SPF record at spf.mandrillapp.com) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.47 Received: by padhk11 with SMTP id hk11so17058374pad.1 for ; Sun, 18 Oct 2015 21:29:54 -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=uqFX19A28VD028BWOXq0SJ2Bp08Hp60IoIw/t6Er6yc=; b=FPdgwBFS63sgSfEhUrxdqUNo4SMgmN7kLU6UKMwgkO84iAE3WenQ2qhLLCHpIGXwlY d3q5jxQ+v+zFFkrzfzDOcOUQngOF3gO959EtnMxqXMRdSWlLEf7ZDEnPwE0mIMjIn8JN fsHMQccayzhKRg4Vq4ORByHIy6yXW98KFaGLUBHPcJGtPFictnK6kuWm5CJhkHy1TV2N QIu0/iyttSkK18pWN2EHDm1h/BRV89tjuEjaq6fmk+zImPK+XTt6V/Udezd/dJSJK9ow E1sz9d7n9qGqYvmrjeWcluj7jXtfhAcwGkcFVO/tB5vdb47fTJdFBbzJNQ2V1XxDVKDj k7ow== X-Gm-Message-State: ALoCoQnZP2N7f+8kyfEhHD+xbqFS7jVNNkj1fzgbIrlojNhP57bxyK3QFc2uGYNzHv5hdmS1i1Xg X-Received: by 10.69.17.1 with SMTP id ga1mr31705839pbd.163.1445228994896; Sun, 18 Oct 2015 21:29:54 -0700 (PDT) Received: from giraffe.local.net (p2916125-ipngn18101marunouchi.tokyo.ocn.ne.jp. [153.226.221.125]) by smtp.gmail.com with ESMTPSA id we9sm33794799pab.3.2015.10.18.21.29.53 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 18 Oct 2015 21:29:54 -0700 (PDT) X-CudaMail-Envelope-Sender: yamamoto@midokura.com X-Barracuda-Apparent-Source-IP: 153.226.221.125 From: YAMAMOTO Takashi To: dev@openvswitch.org X-CudaMail-MID: CM-E2-1017034122 X-CudaMail-DTE: 101815 X-CudaMail-Originating-IP: 209.85.220.47 Date: Mon, 19 Oct 2015 13:29:04 +0900 X-ASG-Orig-Subj: [##CM-E2-1017034122##][PATCH 13/21] dpif_dummy_override: Allow overriding a non-existing provider Message-Id: <1445228952-22445-13-git-send-email-yamamoto@midokura.com> X-Mailer: git-send-email 2.3.8 (Apple Git-58) In-Reply-To: <1445228952-22445-1-git-send-email-yamamoto@midokura.com> References: <1445228952-22445-1-git-send-email-yamamoto@midokura.com> X-GBUdb-Analysis: 0, 209.85.220.47, Ugly c=0.440712 p=-0.527778 Source Normal X-MessageSniffer-Rules: 0-0-0-4047-c X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1445228995 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.60 X-Barracuda-Spam-Status: No, SCORE=0.60 using per-user scores of TAG_LEVEL=3.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=3.0 tests=BSF_SC5_MJ1963, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.23618 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Cc: YAMAMOTO Takashi Subject: [ovs-dev] [PATCH 13/21] dpif_dummy_override: Allow overriding a non-existing provider X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" This allows --enable-dummy=system with a userland-only build. It's useful for testsuite. Signed-off-by: YAMAMOTO Takashi Acked-by: Ben Pfaff --- lib/dpif-netdev.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 47fa9e2..4dcfded 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -3786,7 +3786,14 @@ dpif_dummy_register__(const char *type) static void dpif_dummy_override(const char *type) { - if (!dp_unregister_provider(type)) { + int error; + + /* + * Ignore EAFNOSUPPORT to allow --enable-dummy=system with + * a userland-only build. It's useful for testsuite. + */ + error = dp_unregister_provider(type); + if (error == 0 || error == EAFNOSUPPORT) { dpif_dummy_register__(type); } }