From patchwork Wed Apr 3 21:52:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 161709 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp833041jan; Wed, 3 Apr 2019 14:53:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqwZ5eMiJAMXIWnNte2hTNlHd56cmAUCm6tqEsuCazDoYNij6I97RJjqgCFLJyTFG5/tFM+3 X-Received: by 2002:ae9:df41:: with SMTP id t62mr2124611qkf.150.1554328380241; Wed, 03 Apr 2019 14:53:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554328380; cv=none; d=google.com; s=arc-20160816; b=K0QRuFP19yNSpO4ynFw7qS9OdR8upfLzogwVjHffCpZ+ahmeLkdPzDpYG7kNaHuUI8 MQY49W0Ug1prBkQQ9xP3uLkVpQgq3jYwo1rrMC/bXnU+p7cDQD/RZ/O7Lb1wvgEvAHUd 0yGhjgV7eq1qMxwdhMkspUOv1o1uUecrOG/vh+WSz/hcmZxJiPzXxZeXJPbCAJyA7QDo nj0HxV82e99UwsP1sz2L9gVOgPGbC7msVp0x5Dk7/0O+T8B3uZk7AKD2DPWuZ5gsIZAx wNUzTMISyjNYSXYsTElf6wmxnD57tLOemxQDeuNLgxzjhvemnln014DO7Lw+gwLHPNip WPhQ== 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=mAKOuFSnMY6fwc/Ix4OsJmdPIqZpRAmsktG0bYZMVvI=; b=tVoIWbeDyaIeieEybiUyROKXIy8/TxddYHlqQfNn49T0NT2HEdtLkkBqQh47yqtA0K 1dVoHrZOcM4jeonq+y3dZ3u2TCxTYQDqCno3//2wtTz9ZKG5YZ/PCQMGxnZKexi0p5QP szyDhVICMqv6pYtkZyHdosYco0J2Z7x2sxzVg/H10F9gC4TknOPB1FbOAVziLOhS0JbO vE7hM7JfH+LmdM2PiFpVyYD+ZKJBVaxluRaXDz1JUfyY2c/kRXOAR5SVMP5ihm/HTm25 uYislOz0QmmXlWuheoRISrG/QMuvs6rCGnSSthfn7CbruVK3d6ayZdTWv8Wew7twwY/v ktaQ== 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 i7si1244725qvi.175.2019.04.03.14.53.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 14:53:00 -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-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D39AE3082AF0; Wed, 3 Apr 2019 21:52:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F1096B2D8; Wed, 3 Apr 2019 21:52:58 +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 07308181AC44; Wed, 3 Apr 2019 21:52:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x33Lqt2k013205 for ; Wed, 3 Apr 2019 17:52:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4CFE9BA9B; Wed, 3 Apr 2019 21:52:55 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-120-38.rdu2.redhat.com [10.10.120.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD1EE5FCC4; Wed, 3 Apr 2019 21:52:52 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 3 Apr 2019 17:52:43 -0400 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/6] build-aux: header-ifdef: Fix typos 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 03 Apr 2019 21:52:59 +0000 (UTC) Signed-off-by: Cole Robinson --- build-aux/header-ifdef.pl | 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 diff --git a/build-aux/header-ifdef.pl b/build-aux/header-ifdef.pl index ccabf14055..297696eb70 100644 --- a/build-aux/header-ifdef.pl +++ b/build-aux/header-ifdef.pl @@ -106,7 +106,7 @@ while (<>) { } } elsif ($state == $STATE_PRIV_START) { if (/^$/) { - &mistake("$file: too many blank lines after coyright header"); + &mistake("$file: too many blank lines after copyright header"); } elsif (/#ifndef $ifdefpriv$/) { $state = $STATE_PRIV_ERROR; } else { @@ -116,7 +116,7 @@ while (<>) { if (/# error ".*"$/) { $state = $STATE_PRIV_END; } else { - &mistake("$file: missing '#error ...priv allow...'"); + &mistake("$file: missing '# error ...priv allow...'"); } } elsif ($state == $STATE_PRIV_END) { if (m,#endif /\* $ifdefpriv \*/,) { @@ -131,7 +131,7 @@ while (<>) { $state = $STATE_GUARD_START; } elsif ($state == $STATE_GUARD_START) { if (/^$/) { - &mistake("$file: too many blank lines after coyright header"); + &mistake("$file: too many blank lines after copyright header"); } elsif (/#ifndef $ifdef$/) { $state = $STATE_GUARD_DEFINE; } else { From patchwork Wed Apr 3 21:52:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 161710 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp833159jan; Wed, 3 Apr 2019 14:53:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqweH8P/hPo5SOCZunyu3WcTWpqq817b5kaY5j9C0WlDw85E52UpvQ6yqi/vv8QbhEEamMWV X-Received: by 2002:a37:aa11:: with SMTP id t17mr2149017qke.193.1554328393194; Wed, 03 Apr 2019 14:53:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554328393; cv=none; d=google.com; s=arc-20160816; b=Cv1cx9EQW5Ju/Dv/chX/5EEbqouvf23ewOxmeNZKLOvikv+HF7pms2r8jgi3QVoj3L JdfikFWjBVZt1+qTnAL3gKbPVMtV+XpYtpPgYwSSAgwIoBUac6l90O9U2Wz1Yq4Vc+Xr MvBr/piPprkc2ApASDn9/alG7yTJ+gihOQ8+gRsN7+byhY/DZzQzVZ9VkAmJTt2H2wf0 ziVVMDHldEEDYYWXmCqBxwbjnFwO0jaUIV+XExnizXAHTYW9DdosjFOrOF1bydmrAJrh /UXLwJKaZ2GpMu3b+Q2WJ5zRpEneWYkbPUui/xSqcA6fa8Bv4zB/A/HA+vkJeCyQFD+J Ildg== 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=LT2c77ARlRBxITHCOBwt2g/6cIH4rgFTZFk8+Zvg5iA=; b=pwGi1CaHmzxKAzrjnxXDo+tXVAXxiBNDu/nIv4tBhds7BWTmoU2iXW0toAjvRp5pFg RKoafFknbm0DxztIvUSShTSfEMVvXBFe/Cc4nBPXBlssbHGHOmfP/2FmntOerxwYtvJe G1gx5EIO0Hjh9AI9CKUvhpOhGa1igUKTSMaD5Qjty210/ixlR920XSCu74NuQ+b815nH 7pZb0a856fI5qLM0jzquLIn4o02e7rAgfx+oTahb7nokKYMMHWy8ftK1zNw464fo/wQW ZEqoHCTxVaER+AaRjFHXglgTKKBJbm6z59TdqnXu9MKxdaNYnZFsU2QZgwsa7yXRGPw3 36EA== 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 w7si2451285qki.216.2019.04.03.14.53.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 14:53:13 -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-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EAAAE316891B; Wed, 3 Apr 2019 21:53:11 +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 C099F643E7; Wed, 3 Apr 2019 21:53:11 +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 8346D41F3E; Wed, 3 Apr 2019 21:53:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x33Lqv5e013215 for ; Wed, 3 Apr 2019 17:52:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 89E10BA9B; Wed, 3 Apr 2019 21:52:57 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-120-38.rdu2.redhat.com [10.10.120.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0989B6B2D8; Wed, 3 Apr 2019 21:52:55 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 3 Apr 2019 17:52:44 -0400 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/6] build-aux: header-ifdef: Handle #pragma once 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 03 Apr 2019 21:53:12 +0000 (UTC) If we see if, skip all remaining header guard checks Signed-off-by: Cole Robinson --- build-aux/header-ifdef.pl | 5 +++++ 1 file changed, 5 insertions(+) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/build-aux/header-ifdef.pl b/build-aux/header-ifdef.pl index 297696eb70..401f25fb81 100644 --- a/build-aux/header-ifdef.pl +++ b/build-aux/header-ifdef.pl @@ -32,6 +32,7 @@ my $STATE_GUARD_START = 6; my $STATE_GUARD_DEFINE = 7; my $STATE_GUARD_END = 8; my $STATE_EOF = 9; +my $STATE_PRAGMA = 10; my $file = " "; my $ret = 0; @@ -132,6 +133,8 @@ while (<>) { } elsif ($state == $STATE_GUARD_START) { if (/^$/) { &mistake("$file: too many blank lines after copyright header"); + } elsif(/#pragma once/) { + $state = $STATE_PRAGMA; } elsif (/#ifndef $ifdef$/) { $state = $STATE_GUARD_DEFINE; } else { @@ -147,6 +150,8 @@ while (<>) { if (m,#endif /\* $ifdef \*/$,) { $state = $STATE_EOF; } + } elsif ($state == $STATE_PRAGMA) { + next; } elsif ($state == $STATE_EOF) { die "$file: unexpected content after '#endif /* $ifdef */'"; } else { From patchwork Wed Apr 3 21:52:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 161711 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp833162jan; Wed, 3 Apr 2019 14:53:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqzpakOeJ2/lV9vIWPSfQSZ9Sdao/ML6X4xvQNpADq2fLudc+AImI4o4icF6ddKFSGaZzgOK X-Received: by 2002:a0c:acf8:: with SMTP id n53mr1730782qvc.83.1554328393468; Wed, 03 Apr 2019 14:53:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554328393; cv=none; d=google.com; s=arc-20160816; b=bn0j2jXYkxwwxFAu3z4TaGkIOk15Bt6D3oC/J5dVQEsTWZ07LHQN3sXyvXQZy2hGnh h1LVjkIe2anJH4a0HW0EhmNuZtNxlPzV8HgET8m7M9EycwTEwdvZIfeCxg/wyg103v9b MYwDJKFH8gFw7A9MtyLrZqRb6PFxRu9Dbtule4OWULYGjbAZXWIFpOCGOtijrdLmOoV+ WhJq0IjOWwCLRqMTRaUUSHdB3/8J2xjyHQo3zDbMKrpcM69ktdhtEVIr50GCHTqjgRQY JtBU+CzQRPNTWzuMIxN+eXOwJmgDAE/BVqu2QKmJRF12NtgcmSWdUjJvS3RGIPwo/i9H X0lg== 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=yLyIcAiIJw0/SWJxS0TyY5Mji5SJtTreTtPq1QzNqsE=; b=Bf6rtqE2mmSdatIu4ieRNHw9QgYXOn5uSIhyqHQo4QOmINbS7QpIDkFhIyiG5Ee+lS bIgMrY12agREn7p8RH6zATJn79YXMdEn4eYqfDxu8GTtszxGWAmgzcItYHr7MuCG28Ti J5CGkMHpMfrvC8yRSKkiBMzDv5pFpDiEK9CCJerMHAk/ztIPZW0/Ivktv//NHHyKuLkU 49lh/JnIQVSXpUVEWKr7xZlcCQxO5Vd1RbwVNKjmAPd/vb7sYUY9NjtIcdkPMh+Isk1t uz34DC2CDiK2XSWlHAF2Qhi/5mTHKm/Zo/PoWcdFKHmLNb8cd0QwEzXYN1j1eamnTrgS V25A== 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 l22si2872737qtl.183.2019.04.03.14.53.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 14:53:13 -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-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 262A881E10; Wed, 3 Apr 2019 21:53:12 +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 F376462674; Wed, 3 Apr 2019 21:53:11 +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 B551F41F3F; Wed, 3 Apr 2019 21:53:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x33LqwV3013220 for ; Wed, 3 Apr 2019 17:52:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 25DB1BA9B; Wed, 3 Apr 2019 21:52:58 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-120-38.rdu2.redhat.com [10.10.120.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id B766161082; Wed, 3 Apr 2019 21:52:57 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 3 Apr 2019 17:52:45 -0400 Message-Id: <426184e756310f6d9bdae983a945080ae1713c03.1554328223.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/6] node_device_driver.h: Use #pragma once 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 03 Apr 2019 21:53:12 +0000 (UTC) Signed-off-by: Cole Robinson --- src/node_device/node_device_driver.h | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index 5876671c03..eae5e2cb17 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -19,24 +19,23 @@ * . */ -#ifndef LIBVIRT_NODE_DEVICE_DRIVER_H -# define LIBVIRT_NODE_DEVICE_DRIVER_H +#pragma once -# include "internal.h" -# include "driver.h" -# include "virnodedeviceobj.h" +#include "internal.h" +#include "driver.h" +#include "virnodedeviceobj.h" -# define LINUX_NEW_DEVICE_WAIT_TIME 60 +#define LINUX_NEW_DEVICE_WAIT_TIME 60 -# ifdef WITH_HAL +#ifdef WITH_HAL int halNodeRegister(void); -# endif +#endif -# ifdef WITH_UDEV +#ifdef WITH_UDEV int udevNodeRegister(void); -# endif +#endif void nodeDeviceLock(void); @@ -117,5 +116,3 @@ nodeConnectNodeDeviceEventRegisterAny(virConnectPtr conn, int nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr conn, int callbackID); - -#endif /* LIBVIRT_NODE_DEVICE_DRIVER_H */ From patchwork Wed Apr 3 21:52:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 161713 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp833205jan; Wed, 3 Apr 2019 14:53:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqz5rIwpUGc8k3vtT/+VPrJIeyO4d1csHMr2KBJ5w9KUBfWgZoCsZ27TGVeDkKBU3atcGtMV X-Received: by 2002:a0c:d4a2:: with SMTP id u31mr1800501qvh.139.1554328397104; Wed, 03 Apr 2019 14:53:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554328397; cv=none; d=google.com; s=arc-20160816; b=JbEmSReAT6i+mrHPF/u76tcZszXCIxjxryh9IqC18iwBGW31OTR27paMU7uIa4SocX r5s85VSoGvLi/UvxRb88cim47jPoBjOWf4cLUfDy0L56j2LXM5f+gnqFUHjdlNwzCN7l ehmezEUZG9BG4cO4xLF0gVkcKjDdCbfJB3pbn5K+VCDMJi1hMi2z8Tq/REp6l+dYwkDn mhPldlplo0MWq4aijt23IUu27FDUrdqU/LrNWPOXr9e1b9vC9smNNhR2hSlXBahSfAuE KGqdjbJyNcvRQrFT+LyiQ93OhmZEYJi+XvwRbtqODqwKElKq62lEq7DQ1CRjrJLjPPwR rhFw== 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=Sjp1Bn4o9xLmHxAs8Ln6b/7TcuEBPqgX3/TcyNfFyIA=; b=J2R6QH6VwfaVJuKzHDRoFTZ7JeLQVyzL5sHb5/iiKZKERFddOpuJeymdXBLdtqyOEM Sjzk+AdtMFF9pS6XQtmnP/SFGfPWIf9yjJwkHnpx37BlqfkAA5bO09Sq8Q54hWWWPnIH KMKrUc5hTkuYjFoq9WzLGtPs4zu2Ho8sh/f1Pfoy6Nya4xFNHQSuZqCeQXBUXgSppGxj yGKYLQTlIo86HShXcMwWWJqzUP4MoW/1pCKUGp3MOI95UUL34m8dykALnoRZ7zHSOrnm X7vmJWJ5wBD5GZ19o8JLFQzHGcW9/rahs89pOacQ2iR7tOhD20yFg4T+b7v8wtV36K38 uNUw== 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 d26si8382880qkk.57.2019.04.03.14.53.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 14:53:17 -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-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A7992307E05C; Wed, 3 Apr 2019 21:53:15 +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 8262B643EC; Wed, 3 Apr 2019 21:53:15 +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 44B1D3FB16; Wed, 3 Apr 2019 21:53:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x33Lqwmi013225 for ; Wed, 3 Apr 2019 17:52:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id B66E5BA9B; Wed, 3 Apr 2019 21:52:58 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-120-38.rdu2.redhat.com [10.10.120.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53F3861082; Wed, 3 Apr 2019 21:52:58 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 3 Apr 2019 17:52:46 -0400 Message-Id: <2ae9bc71554fc73a6120a768c82b1ee4ff3e0f38.1554328223.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/6] node_device_udev.h: Use #pragma once 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 03 Apr 2019 21:53:16 +0000 (UTC) Signed-off-by: Cole Robinson --- src/node_device/node_device_udev.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h index 8c1d8fec1d..996677dfe0 100644 --- a/src/node_device/node_device_udev.h +++ b/src/node_device/node_device_udev.h @@ -18,13 +18,10 @@ * . */ -#ifndef LIBVIRT_NODE_DEVICE_UDEV_H -# define LIBVIRT_NODE_DEVICE_UDEV_H +#pragma once -# include +#include -# define SYSFS_DATA_SIZE 4096 -# define DMI_DEVPATH "/sys/devices/virtual/dmi/id" -# define DMI_DEVPATH_FALLBACK "/sys/class/dmi/id" - -#endif /* LIBVIRT_NODE_DEVICE_UDEV_H */ +#define SYSFS_DATA_SIZE 4096 +#define DMI_DEVPATH "/sys/devices/virtual/dmi/id" +#define DMI_DEVPATH_FALLBACK "/sys/class/dmi/id" From patchwork Wed Apr 3 21:52:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 161714 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp833238jan; Wed, 3 Apr 2019 14:53:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqyANQwVdyd767PDv456TYaIQL6rFlWWiHm9qeplL/ORrW6fbnWNjipPk+wbjH2bSQEH8IKS X-Received: by 2002:a05:620a:159b:: with SMTP id d27mr2070506qkk.163.1554328400291; Wed, 03 Apr 2019 14:53:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554328400; cv=none; d=google.com; s=arc-20160816; b=c1afLaR6OMcnON21h4W25VHljef6Lh5u1pe78Y44LtyRTDnFAqKKxXcu5lc9FKpAN8 G8JbsWUdKtIvCEX/1HRESkj05e2X90Q6BUaJNBoL9+qI0tASH9juhgxisDknzqzva57j eXZgqiZMFcmuB70cQfz7BMcsVaN2WKTI2Q7TdedadL6fuL6sv6gMX44fhU1wmW3A3GjJ jpDclFiDQL6ilkUNwAH+IPARToImioIHe9Xig2Ge260mecGIB/MRtNslB41jvC0LUTOZ 4wM2LApCDaLik+mbxIwDdfYPOxAzvloHXtWZcvZ8ReLbNhMfng7X0Njuyfiy2enww5Ws Fv/w== 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=bywtXApkhWKZVRMOrFxsid0y5rWv63McRu2eQ5n4zgQ=; b=mMvypvQGheMpPKaQGgF5ooMYru0DybxY4JmIeCGQBmV5ZSLPxH1h6GnDRJ0giHDrjp 1i2ICvLqd3PDLbs1UV7hE5pyzEI1gCINYr6AJpx4MfGTAwSCnO+PINiBuYtoT3xVM5Wk OR6GZPCSGbrayFqy7zm8AKy10El1NCO2kAUfx8/W29Nbgd0h4mEIXUMDkbPElWxil56q ejXJyXfVfItNe7AB9CU0MkpRX2AgSHi5uNZWGPUoESmv99Yah8K9w3rKpLYYPoqf1+fk F3+lYUPBnkZkHhe/Q6RzTS3lllS6mr4mlpxdndlUO+ts+chnXdACjvxVRh36VARYh4Se bpmA== 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 l8si3195978qtn.217.2019.04.03.14.53.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 14:53:20 -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-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DD9A581E1A; Wed, 3 Apr 2019 21:53:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BBBDA61082; Wed, 3 Apr 2019 21:53:18 +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 7A1BF181AC46; Wed, 3 Apr 2019 21:53:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x33Lqxwh013235 for ; Wed, 3 Apr 2019 17:52:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5364D61082; Wed, 3 Apr 2019 21:52:59 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-120-38.rdu2.redhat.com [10.10.120.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id E452160C47; Wed, 3 Apr 2019 21:52:58 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 3 Apr 2019 17:52:47 -0400 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/6] node_device_hal.h: Use #pragma once 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 03 Apr 2019 21:53:19 +0000 (UTC) Signed-off-by: Cole Robinson --- src/node_device/node_device_hal.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/node_device/node_device_hal.h b/src/node_device/node_device_hal.h index ffcf0c84e6..5e9c25ae34 100644 --- a/src/node_device/node_device_hal.h +++ b/src/node_device/node_device_hal.h @@ -19,7 +19,4 @@ * */ -#ifndef LIBVIRT_NODE_DEVICE_HAL_H -# define LIBVIRT_NODE_DEVICE_HAL_H - -#endif /* LIBVIRT_NODE_DEVICE_HAL_H */ +#pragma once From patchwork Wed Apr 3 21:52:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 161712 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp833200jan; Wed, 3 Apr 2019 14:53:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqxY2Ao1kP3KJRPVdQwDBlO4+F5Gi6bulaIgPVphduwtVilaiyy04KpAW3T5M9CIY5Q/XSuw X-Received: by 2002:a0c:86cd:: with SMTP id 13mr1783460qvg.146.1554328396914; Wed, 03 Apr 2019 14:53:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554328396; cv=none; d=google.com; s=arc-20160816; b=ed32PwWmwwd+/kczi2TVI7QMTmM4ojh/HI0VomLNRVJD9I5/DOeRbVoU5q76slWMK/ qvooI8uWKOQgkTQ+7oMbkto5Gjaplzj5owErR6lCCQvfyAXmsJ5mcBsq85kZVs6TgSOR GS58/laC0tsJhareSqpbiqFGUH+v6L2RdbVrAWr7zijYLUfMqDszl5mZLyyNh/o1MApQ tpDwFJYlU0hv3sNXm6yebTkw9KjJ6KuWlbUnyvt4r5/pvxwBqoJyb/kMiFVg6n8w5KVK uvL5NzKjqogsSabVuWGLKFUFddh0J6MbJyHsRfKPd9BM9K9kYA3f/gUDS0quOA7kYxmF BPdg== 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=oUSz9axGQwOQF2lsASUMBpaz700BFU/BXnpKueCv7iw=; b=T41UelB6h8AEzy6IIuyD9z/TGntr7Db/HbzaDC2ko267esx2B1H8539XKYiBgnQR+t yCDStepXauGe33KBLbD+cpxrdmZ/5dBxiZYYiU7zHwmjm5WtwdQPYZar33xumkVNbQNk kweH49omISw7nkNHQ8GId53LTZQT5HpU9+wgOilkyMUiQn2SYypzwM5jDISGbU0vnD5Z G4yohztQyJBikxtN0kqZgFzmLh8jHZ5HsCm6lA8EEwR2aCa38eUayngJNk8MSQsi6zxV 9CcDGBjSwfq3uuHj/HpeIGhhFMegSUoNOiU4RbqbDRsxEnonKiSyINdu5EiKgQAkZTf+ 2jzQ== 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 b54si5589220qte.184.2019.04.03.14.53.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Apr 2019 14:53:16 -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-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A82B23007C43; Wed, 3 Apr 2019 21:53:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 832D4BA9B; Wed, 3 Apr 2019 21:53:15 +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 46294181AC46; Wed, 3 Apr 2019 21:53:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x33Lr14B013249 for ; Wed, 3 Apr 2019 17:53:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id D58ADBA9B; Wed, 3 Apr 2019 21:53:01 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-120-38.rdu2.redhat.com [10.10.120.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5ED1561082; Wed, 3 Apr 2019 21:52:59 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 3 Apr 2019 17:52:48 -0400 Message-Id: <0ac0824c77505640d4c4f07972b1ede348c74387.1554328223.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/6] vircgrouppriv.h: Use #pragma once 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 03 Apr 2019 21:53:16 +0000 (UTC) Signed-off-by: Cole Robinson --- src/util/vircgrouppriv.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h index a6fb3bb9f8..9110c77297 100644 --- a/src/util/vircgrouppriv.h +++ b/src/util/vircgrouppriv.h @@ -23,11 +23,10 @@ # error "vircgrouppriv.h may only be included by vircgroup.c or its test suite" #endif /* LIBVIRT_VIRCGROUPPRIV_H_ALLOW */ -#ifndef LIBVIRT_VIRCGROUPPRIV_H -# define LIBVIRT_VIRCGROUPPRIV_H +#pragma once -# include "vircgroup.h" -# include "vircgroupbackend.h" +#include "vircgroup.h" +#include "vircgroupbackend.h" struct _virCgroupV1Controller { int type; @@ -127,5 +126,3 @@ int virCgroupKillRecursiveInternal(virCgroupPtr group, int controller, const char *taskFile, bool dormdir); - -#endif /* LIBVIRT_VIRCGROUPPRIV_H */