From patchwork Mon Apr 8 15:48:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 161940 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3843570jan; Mon, 8 Apr 2019 08:48:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqytzO6msYeF0lWhhrkHQyXdgpTQ3Y/Via0Ph+TNoMhS09IQ0kSjb+DYshwSK3MwY4orMtmw X-Received: by 2002:ac8:1778:: with SMTP id u53mr24652225qtk.270.1554738519395; Mon, 08 Apr 2019 08:48:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554738519; cv=none; d=google.com; s=arc-20160816; b=Lj09vbbixfxPPaH3uOsZtzvvhZ90qi6nw0yfVVE9E0yDw9unQN95KJtFc2YnHn1Llq fRK7hglSIxpDOC5vk90CVIHtn+pd97xzbtgjIdeqyQivCa6D4cflnttMH8EstdAcX0hO kBd1U93ofe7V9uH5QWrrLNytFGDKejVLqttZOWGCD+9U9CnyF5r7MHPoM90vypqobxEe 7UhT2Cy8ftWdMdeNfi/N5TRWKU4kYvgwOpnjMi+6W3dEgO3qO+8Wnl27v7/i86uRFiwC 8GY50mSYkc4xRlLEcFDc+b4YoXqOoVtaxonp75QGH2vPJQHhEOLguwd5RYa7wXietcdO jFxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=BFuggR4N6tkl9YYfRl2PURxJd6tOBdyekq89jvQimNU=; b=FS2tVRuJsEyR7aBaNgECQX0EUaIENn1KeU4SJvwqH8Iu0Dc91iC5Hr2bgMPpYwaknr hLE4BEuBSPlaqkOzponKfAqYmII3keEFyhjZIopZnGY6OO1eDFGH8vPrzxYRDzfFCRae 4Ba9max4ZGwxYL712cqWpyWZ3OUuoEq78KISbqhpGAVZlK0lRHaqGc1XSTORUO7HyYyP qjzflGsv1SfmkMfjCnB8POAcjK3dR5xU3Ea0XSIrgoRZ7nf6yZecEpZSR2t+eN9G4y6C SHZ2c+Dh+YxyhIPjtLkeSob9AxULtHqxjQnc4aqAAF6YP37rhM/pnRcMTth/ySnRhlem pB/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id k22si1157796qvg.31.2019.04.08.08.48.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 08:48:39 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E4394307CEBD; Mon, 8 Apr 2019 15:48:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9EC5460472; Mon, 8 Apr 2019 15:48:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0B51C41F3C; Mon, 8 Apr 2019 15:48:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x38FmZkh024571 for ; Mon, 8 Apr 2019 11:48:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6D31A5DA2C; Mon, 8 Apr 2019 15:48:35 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-126-26.rdu2.redhat.com [10.10.126.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA8C45D9C9; Mon, 8 Apr 2019 15:48:33 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 8 Apr 2019 11:48:17 -0400 Message-Id: <4999fcfcd56a2eb17143ca344fbe726058211569.1554737741.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/4] cfg.mk: Only force _LAST enum on VIR_ENUM_IMPL second line X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 08 Apr 2019 15:48:38 +0000 (UTC) Drop the checking for _LAST optionally on the first line, previous patch removed all those instances Signed-off-by: Cole Robinson --- cfg.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Daniel P. Berrangé diff --git a/cfg.mk b/cfg.mk index bb684f381d..b785089910 100644 --- a/cfg.mk +++ b/cfg.mk @@ -809,11 +809,11 @@ sc_prohibit_cross_inclusion: sc_require_enum_last_marker: @$(VC_LIST_EXCEPT) | xargs \ $(GREP) -A1 -nE '^[^#]*VIR_ENUM_IMPL *\(' /dev/null \ - | $(SED) -ne '/VIR_ENUM_IMPL[^,]*,$$/N' \ - -e '/VIR_ENUM_IMPL[^,]*,[^,]*[^_,][^L,][^A,][^S,][^T,],/p' \ + | $(SED) -ne '/VIR_ENUM_IMPL.*,$$/N' \ + -e '/VIR_ENUM_IMPL[^,]*,[^,]*,[^,]*[^_,][^L,][^A,][^S,][^T,],/p' \ -e '/VIR_ENUM_IMPL[^,]*,[^,]\{0,4\},/p' \ | $(GREP) . && \ - { echo '$(ME): enum impl needs to use _LAST marker' 1>&2; \ + { echo '$(ME): enum impl needs _LAST marker on second line' 1>&2; \ exit 1; } || : # In Python files we don't want to end lines with a semicolon like in C