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 */