From nobody Mon Feb 9 15:50:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559938906; cv=none; d=zoho.com; s=zohoarc; b=Y7FWlsOZYAk0JxFZWOfjYjtu1HnbmJpDr0AuhlAT/yHWOJdi/M3eGdZKjiDcsdoyjpKN/mGHAMFYANmLaqLSGjrcea2K5OQmPjKqAR5pGjXhwRQyBqdljT7PXhTNU+r9MNhQvdaBhdGkU6WVXy8o7JCp8Dn7po7Hv7kfbOHTJ0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559938906; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=zS0MJ50Ylnw2vxAmnjzWKp5CKTnrp47wB6sZSyr8Czk=; b=kb/dVvS/dLjqt+22GcgwhTeFqRigmPWgYUTO8JlXqiP4N8B2ndOByWt+oMFVSz98xo3NDhkqeBPpdomDgmCQQDufxM5ovIJdwkia6sutAXiF8pt9vs/F1l55cHmJq8m0B4ohefi0XSk64XYPMi0ZCFU8zYTf7qujMk36/qyU1O4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1559938906853454.3580868246396; Fri, 7 Jun 2019 13:21:46 -0700 (PDT) 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 D62A4308219F; Fri, 7 Jun 2019 20:21:09 +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 733FA6085B; Fri, 7 Jun 2019 20:21:05 +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 472BA1806B16; Fri, 7 Jun 2019 20:20:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x57KKcRP025690 for ; Fri, 7 Jun 2019 16:20:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id EDF885C206; Fri, 7 Jun 2019 20:20:38 +0000 (UTC) Received: from aegolius.redhat.com (ovpn-117-185.phx2.redhat.com [10.3.117.185]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BA2635C205 for ; Fri, 7 Jun 2019 20:20:36 +0000 (UTC) From: Jonathon Jongsma To: libvir-list@redhat.com Date: Fri, 7 Jun 2019 15:20:15 -0500 Message-Id: <20190607202030.29625-5-jjongsma@redhat.com> In-Reply-To: <20190607202030.29625-1-jjongsma@redhat.com> References: <20190607202030.29625-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/19] src/bhyve: use #pragma once in headers 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: , Content-Transfer-Encoding: quoted-printable 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.47]); Fri, 07 Jun 2019 20:21:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jonathon Jongsma --- src/bhyve/bhyve_capabilities.h | 11 ++++------- src/bhyve/bhyve_command.h | 15 ++++++--------- src/bhyve/bhyve_conf.h | 7 ++----- src/bhyve/bhyve_device.h | 11 ++++------- src/bhyve/bhyve_domain.h | 11 ++++------- src/bhyve/bhyve_driver.h | 9 +++------ src/bhyve/bhyve_monitor.h | 11 ++++------- src/bhyve/bhyve_parse_command.h | 5 +---- src/bhyve/bhyve_process.h | 7 ++----- src/bhyve/bhyve_utils.h | 31 ++++++++++++++----------------- 10 files changed, 44 insertions(+), 74 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index db4aff4775..12926cf423 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -19,13 +19,12 @@ * */ =20 -#ifndef LIBVIRT_BHYVE_CAPABILITIES_H -# define LIBVIRT_BHYVE_CAPABILITIES_H +#pragma once =20 -# include "capabilities.h" -# include "conf/domain_capabilities.h" +#include "capabilities.h" +#include "conf/domain_capabilities.h" =20 -# include "bhyve_utils.h" +#include "bhyve_utils.h" =20 virCapsPtr virBhyveCapsBuild(void); int virBhyveDomainCapsFill(virDomainCapsPtr caps, @@ -54,5 +53,3 @@ typedef enum { =20 int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps); int virBhyveProbeCaps(unsigned int *caps); - -#endif /* LIBVIRT_BHYVE_CAPABILITIES_H */ diff --git a/src/bhyve/bhyve_command.h b/src/bhyve/bhyve_command.h index ae0f770ac2..8c39f4eb2f 100644 --- a/src/bhyve/bhyve_command.h +++ b/src/bhyve/bhyve_command.h @@ -19,16 +19,15 @@ * */ =20 -#ifndef LIBVIRT_BHYVE_COMMAND_H -# define LIBVIRT_BHYVE_COMMAND_H +#pragma once =20 -# include "bhyve_domain.h" -# include "bhyve_utils.h" +#include "bhyve_domain.h" +#include "bhyve_utils.h" =20 -# include "domain_conf.h" -# include "vircommand.h" +#include "domain_conf.h" +#include "vircommand.h" =20 -# define BHYVE_CONFIG_FORMAT_ARGV "bhyve-argv" +#define BHYVE_CONFIG_FORMAT_ARGV "bhyve-argv" =20 virCommandPtr virBhyveProcessBuildBhyveCmd(virConnectPtr conn, virDomainDefPtr def, @@ -41,5 +40,3 @@ virBhyveProcessBuildDestroyCmd(bhyveConnPtr driver, virCommandPtr virBhyveProcessBuildLoadCmd(virConnectPtr conn, virDomainDefPtr def, const char *devmap_file, char **devicesmap_out= ); - -#endif /* LIBVIRT_BHYVE_COMMAND_H */ diff --git a/src/bhyve/bhyve_conf.h b/src/bhyve/bhyve_conf.h index eb4a2e0fb8..7dee377c76 100644 --- a/src/bhyve/bhyve_conf.h +++ b/src/bhyve/bhyve_conf.h @@ -19,10 +19,9 @@ * */ =20 -#ifndef LIBVIRT_BHYVE_CONF_H -# define LIBVIRT_BHYVE_CONF_H +#pragma once =20 -# include "bhyve_utils.h" +#include "bhyve_utils.h" =20 virBhyveDriverConfigPtr virBhyveDriverConfigNew(void); virBhyveDriverConfigPtr virBhyveDriverGetConfig(bhyveConnPtr driver); @@ -37,5 +36,3 @@ struct _bhyveDomainCmdlineDef { }; =20 void bhyveDomainCmdlineDefFree(bhyveDomainCmdlineDefPtr def); - -#endif /* LIBVIRT_BHYVE_CONF_H */ diff --git a/src/bhyve/bhyve_device.h b/src/bhyve/bhyve_device.h index 23b32e0e3e..30c08c2a61 100644 --- a/src/bhyve/bhyve_device.h +++ b/src/bhyve/bhyve_device.h @@ -18,12 +18,11 @@ * . */ =20 -#ifndef LIBVIRT_BHYVE_DEVICE_H -# define LIBVIRT_BHYVE_DEVICE_H +#pragma once =20 -# include "domain_conf.h" -# include "virpci.h" -# include "bhyve_domain.h" +#include "domain_conf.h" +#include "virpci.h" +#include "bhyve_domain.h" =20 int bhyveDomainAssignPCIAddresses(virDomainDefPtr def, virDomainObjPtr obj= ); =20 @@ -32,5 +31,3 @@ virDomainPCIAddressSetPtr bhyveDomainPCIAddressSetCreate(= virDomainDefPtr def, =20 int bhyveDomainAssignAddresses(virDomainDefPtr def, virDomainObjPtr obj) ATTRIBUTE_NONNULL(1); - -#endif /* LIBVIRT_BHYVE_DEVICE_H */ diff --git a/src/bhyve/bhyve_domain.h b/src/bhyve/bhyve_domain.h index 03a2b369d9..17cb283e54 100644 --- a/src/bhyve/bhyve_domain.h +++ b/src/bhyve/bhyve_domain.h @@ -18,13 +18,12 @@ * . */ =20 -#ifndef LIBVIRT_BHYVE_DOMAIN_H -# define LIBVIRT_BHYVE_DOMAIN_H +#pragma once =20 -# include "domain_addr.h" -# include "domain_conf.h" +#include "domain_addr.h" +#include "domain_conf.h" =20 -# include "bhyve_monitor.h" +#include "bhyve_monitor.h" =20 typedef struct _bhyveDomainObjPrivate bhyveDomainObjPrivate; typedef bhyveDomainObjPrivate *bhyveDomainObjPrivatePtr; @@ -42,5 +41,3 @@ extern virDomainDefParserConfig virBhyveDriverDomainDefPa= rserConfig; extern virDomainXMLNamespace virBhyveDriverDomainXMLNamespace; =20 bool bhyveDomainDefNeedsISAController(virDomainDefPtr def); - -#endif /* LIBVIRT_BHYVE_DOMAIN_H */ diff --git a/src/bhyve/bhyve_driver.h b/src/bhyve/bhyve_driver.h index 36d1f8be85..98e75039a3 100644 --- a/src/bhyve/bhyve_driver.h +++ b/src/bhyve/bhyve_driver.h @@ -18,11 +18,10 @@ * . */ =20 -#ifndef LIBVIRT_BHYVE_DRIVER_H -# define LIBVIRT_BHYVE_DRIVER_H +#pragma once =20 -# include "capabilities.h" -# include "bhyve_utils.h" +#include "capabilities.h" +#include "bhyve_utils.h" =20 int bhyveRegister(void); =20 @@ -31,5 +30,3 @@ unsigned bhyveDriverGetCaps(virConnectPtr conn); unsigned bhyveDriverGetGrubCaps(virConnectPtr conn); =20 virCapsPtr bhyveDriverGetCapabilities(bhyveConnPtr driver); - -#endif /* LIBVIRT_BHYVE_DRIVER_H */ diff --git a/src/bhyve/bhyve_monitor.h b/src/bhyve/bhyve_monitor.h index 54c9e70040..226866e6d9 100644 --- a/src/bhyve/bhyve_monitor.h +++ b/src/bhyve/bhyve_monitor.h @@ -18,17 +18,14 @@ * . */ =20 -#ifndef LIBVIRT_BHYVE_MONITOR_H -# define LIBVIRT_BHYVE_MONITOR_H +#pragma once =20 -# include "internal.h" -# include "domain_conf.h" -# include "bhyve_utils.h" +#include "internal.h" +#include "domain_conf.h" +#include "bhyve_utils.h" =20 typedef struct _bhyveMonitor bhyveMonitor; typedef bhyveMonitor *bhyveMonitorPtr; =20 bhyveMonitorPtr bhyveMonitorOpen(virDomainObjPtr vm, bhyveConnPtr driver); void bhyveMonitorClose(bhyveMonitorPtr mon); - -#endif /* LIBVIRT_BHYVE_MONITOR_H */ diff --git a/src/bhyve/bhyve_parse_command.h b/src/bhyve/bhyve_parse_comman= d.h index 3609107711..38521dcc55 100644 --- a/src/bhyve/bhyve_parse_command.h +++ b/src/bhyve/bhyve_parse_command.h @@ -18,11 +18,8 @@ * . */ =20 -#ifndef LIBVIRT_BHYVE_PARSE_COMMAND_H -# define LIBVIRT_BHYVE_PARSE_COMMAND_H +#pragma once =20 virDomainDefPtr bhyveParseCommandLineString(const char* nativeConfig, unsigned caps, virDomainXMLOptionPtr xmlopt); - -#endif /* LIBVIRT_BHYVE_PARSE_COMMAND_H */ diff --git a/src/bhyve/bhyve_process.h b/src/bhyve/bhyve_process.h index f9ad5b6b5a..4f62f6be4b 100644 --- a/src/bhyve/bhyve_process.h +++ b/src/bhyve/bhyve_process.h @@ -19,10 +19,9 @@ * */ =20 -#ifndef LIBVIRT_BHYVE_PROCESS_H -# define LIBVIRT_BHYVE_PROCESS_H +#pragma once =20 -# include "bhyve_utils.h" +#include "bhyve_utils.h" =20 int virBhyveProcessStart(virConnectPtr conn, bhyveConnPtr driver, @@ -44,5 +43,3 @@ void virBhyveProcessReconnectAll(bhyveConnPtr driver); typedef enum { VIR_BHYVE_PROCESS_START_AUTODESTROY =3D 1 << 0, } bhyveProcessStartFlags; - -#endif /* LIBVIRT_BHYVE_PROCESS_H */ diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h index e915bedd87..26956d7d21 100644 --- a/src/bhyve/bhyve_utils.h +++ b/src/bhyve/bhyve_utils.h @@ -19,21 +19,20 @@ * */ =20 -#ifndef LIBVIRT_BHYVE_UTILS_H -# define LIBVIRT_BHYVE_UTILS_H - -# include "driver.h" -# include "domain_event.h" -# include "configmake.h" -# include "virdomainobjlist.h" -# include "virthread.h" -# include "virclosecallbacks.h" -# include "virportallocator.h" - -# define BHYVE_AUTOSTART_DIR SYSCONFDIR "/libvirt/bhyve/autostart" -# define BHYVE_CONFIG_DIR SYSCONFDIR "/libvirt/bhyve" -# define BHYVE_STATE_DIR LOCALSTATEDIR "/run/libvirt/bhyve" -# define BHYVE_LOG_DIR LOCALSTATEDIR "/log/libvirt/bhyve" +#pragma once + +#include "driver.h" +#include "domain_event.h" +#include "configmake.h" +#include "virdomainobjlist.h" +#include "virthread.h" +#include "virclosecallbacks.h" +#include "virportallocator.h" + +#define BHYVE_AUTOSTART_DIR SYSCONFDIR "/libvirt/bhyve/autostart" +#define BHYVE_CONFIG_DIR SYSCONFDIR "/libvirt/bhyve" +#define BHYVE_STATE_DIR LOCALSTATEDIR "/run/libvirt/bhyve" +#define BHYVE_LOG_DIR LOCALSTATEDIR "/log/libvirt/bhyve" =20 typedef struct _virBhyveDriverConfig virBhyveDriverConfig; typedef struct _virBhyveDriverConfig *virBhyveDriverConfigPtr; @@ -75,5 +74,3 @@ struct bhyveAutostartData { =20 void bhyveDriverLock(bhyveConnPtr driver); void bhyveDriverUnlock(bhyveConnPtr driver); - -#endif /* LIBVIRT_BHYVE_UTILS_H */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list