src/qemu: use #pragma once in headers

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Ján Tomko <jtomko@redhat.com>
2025-01-22 04:25:18 +00:00 · 2019-06-18 11:12:37 -05:00 · 2019-06-18 11:12:37 -05:00 · 5dad4b5d93
commit 5dad4b5d93
parent 7d0c966278
32 changed files with 223 additions and 317 deletions
--- a/src/qemu/qemu_agent.h
+++ b/src/qemu/qemu_agent.h
@ -19,11 +19,10 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_AGENT_H
-# define LIBVIRT_QEMU_AGENT_H
+#pragma once

-# include "internal.h"
-# include "domain_conf.h"
+#include "internal.h"
+#include "domain_conf.h"

 typedef struct _qemuAgent qemuAgent;
 typedef qemuAgent *qemuAgentPtr;
@ -121,4 +120,3 @@ int qemuAgentSetUserPassword(qemuAgentPtr mon,
                             const char *user,
                             const char *password,
                             bool crypted);
-#endif /* LIBVIRT_QEMU_AGENT_H */
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@ -19,14 +19,13 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_ALIAS_H
-# define LIBVIRT_QEMU_ALIAS_H
+#pragma once

-# include "domain_conf.h"
+#include "domain_conf.h"

-# include "qemu_capabilities.h"
-# include "qemu_domain.h"
-# include "qemu_domain_address.h"
+#include "qemu_capabilities.h"
+#include "qemu_domain.h"
+#include "qemu_domain_address.h"

 int qemuAssignDeviceChrAlias(virDomainDefPtr def,
                             virDomainChrDefPtr chr,
@ -96,5 +95,3 @@ char *qemuAliasChardevFromDevAlias(const char *devAlias)
 const char *qemuDomainGetManagedPRAlias(void);

 char *qemuDomainGetUnmanagedPRAlias(const char *parentalias);
-
-#endif /* LIBVIRT_QEMU_ALIAS_H */
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@ -16,17 +16,16 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_BLOCK_H
-# define LIBVIRT_QEMU_BLOCK_H
+#pragma once

-# include "internal.h"
+#include "internal.h"

-# include "qemu_conf.h"
-# include "qemu_domain.h"
+#include "qemu_conf.h"
+#include "qemu_domain.h"

-# include "virhash.h"
-# include "virjson.h"
-# include "viruri.h"
+#include "virhash.h"
+#include "virjson.h"
+#include "viruri.h"

 typedef struct qemuBlockNodeNameBackingChainData qemuBlockNodeNameBackingChainData;
 typedef qemuBlockNodeNameBackingChainData *qemuBlockNodeNameBackingChainDataPtr;
@ -127,5 +126,3 @@ qemuBlockSnapshotAddLegacy(virJSONValuePtr actions,
                           virDomainDiskDefPtr disk,
                           virStorageSourcePtr newsrc,
                           bool reuse);
-
-#endif /* LIBVIRT_QEMU_BLOCK_H */
--- a/src/qemu/qemu_blockjob.h
+++ b/src/qemu/qemu_blockjob.h
@ -19,11 +19,10 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_BLOCKJOB_H
-# define LIBVIRT_QEMU_BLOCKJOB_H
+#pragma once

-# include "internal.h"
-# include "qemu_conf.h"
+#include "internal.h"
+#include "qemu_conf.h"

 /**
 * This enum has to map all known block job states from enum virDomainBlockJobType
@ -113,5 +112,3 @@ void qemuBlockJobSyncEnd(virDomainObjPtr vm,
 qemuBlockJobDataPtr
 qemuBlockJobGetByDisk(virDomainDiskDefPtr disk)
    ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
-
-#endif /* LIBVIRT_QEMU_BLOCKJOB_H */
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -19,17 +19,16 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_CAPABILITIES_H
-# define LIBVIRT_QEMU_CAPABILITIES_H
+#pragma once

-# include "virobject.h"
-# include "capabilities.h"
-# include "vircommand.h"
-# include "qemu_monitor.h"
-# include "domain_capabilities.h"
-# include "virfirmware.h"
-# include "virfilecache.h"
-# include "virenum.h"
+#include "virobject.h"
+#include "capabilities.h"
+#include "vircommand.h"
+#include "qemu_monitor.h"
+#include "domain_capabilities.h"
+#include "virfirmware.h"
+#include "virfilecache.h"
+#include "virenum.h"

 /*
 * Internal flags to keep track of qemu command line capabilities
@ -651,5 +650,3 @@ virQEMUCapsGetSEVCapabilities(virQEMUCapsPtr qemuCaps);

 virArch virQEMUCapsArchFromString(const char *arch);
 const char *virQEMUCapsArchToString(virArch arch);
-
-#endif /* LIBVIRT_QEMU_CAPABILITIES_H */
--- a/src/qemu/qemu_capspriv.h
+++ b/src/qemu/qemu_capspriv.h
@ -23,8 +23,7 @@
 # error "qemu_capspriv.h may only be included by qemu_capabilities.c or test suites"
 #endif /* LIBVIRT_QEMU_CAPSPRIV_H_ALLOW */

-#ifndef LIBVIRT_QEMU_CAPSPRIV_H
-# define LIBVIRT_QEMU_CAPSPRIV_H
+#pragma once

 virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps);

@ -105,5 +104,3 @@ virQEMUCapsSetMicrocodeVersion(virQEMUCapsPtr qemuCaps,

 void
 virQEMUCapsStripMachineAliases(virQEMUCapsPtr qemuCaps);
-
-#endif /* LIBVIRT_QEMU_CAPSPRIV_H */
--- a/src/qemu/qemu_cgroup.h
+++ b/src/qemu/qemu_cgroup.h
@ -19,13 +19,12 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_CGROUP_H
-# define LIBVIRT_QEMU_CGROUP_H
+#pragma once

-# include "virusb.h"
-# include "vircgroup.h"
-# include "domain_conf.h"
-# include "qemu_conf.h"
+#include "virusb.h"
+#include "vircgroup.h"
+#include "domain_conf.h"
+#include "qemu_conf.h"

 int qemuSetupImageCgroup(virDomainObjPtr vm,
                         virStorageSourcePtr src);
@ -82,4 +81,3 @@ int qemuCgroupEmulatorAllNodesAllow(virCgroupPtr cgroup,
 void qemuCgroupEmulatorAllNodesRestore(qemuCgroupEmulatorAllNodesDataPtr data);

 extern const char *const defaultDeviceACL[];
-#endif /* LIBVIRT_QEMU_CGROUP_H */
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@ -19,27 +19,26 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_COMMAND_H
-# define LIBVIRT_QEMU_COMMAND_H
+#pragma once

-# include "domain_addr.h"
-# include "domain_conf.h"
-# include "vircommand.h"
-# include "virenum.h"
-# include "capabilities.h"
-# include "qemu_block.h"
-# include "qemu_conf.h"
-# include "qemu_domain.h"
-# include "qemu_domain_address.h"
-# include "qemu_capabilities.h"
-# include "logging/log_manager.h"
+#include "domain_addr.h"
+#include "domain_conf.h"
+#include "vircommand.h"
+#include "virenum.h"
+#include "capabilities.h"
+#include "qemu_block.h"
+#include "qemu_conf.h"
+#include "qemu_domain.h"
+#include "qemu_domain_address.h"
+#include "qemu_capabilities.h"
+#include "logging/log_manager.h"

 /* Config type for XML import/export conversions */
-# define QEMU_CONFIG_FORMAT_ARGV "qemu-argv"
+#define QEMU_CONFIG_FORMAT_ARGV "qemu-argv"

-# define QEMU_FSDEV_HOST_PREFIX "fsdev-"
+#define QEMU_FSDEV_HOST_PREFIX "fsdev-"

-# define QEMU_BLOCK_IOTUNE_MAX 1000000000000000LL
+#define QEMU_BLOCK_IOTUNE_MAX 1000000000000000LL

 VIR_ENUM_DECL(qemuVideo);

@ -227,5 +226,3 @@ qemuBuildTPMOpenBackendFDs(const char *tpmdev,
                           int *cancelfd)
    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
    ATTRIBUTE_NONNULL(4);
-
-#endif /* LIBVIRT_QEMU_COMMAND_H */
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@ -19,37 +19,36 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_CONF_H
-# define LIBVIRT_QEMU_CONF_H
+#pragma once

-# include <unistd.h>
+#include <unistd.h>

-# include "virebtables.h"
-# include "internal.h"
-# include "capabilities.h"
-# include "network_conf.h"
-# include "domain_conf.h"
-# include "snapshot_conf.h"
-# include "domain_event.h"
-# include "virthread.h"
-# include "security/security_manager.h"
-# include "virpci.h"
-# include "virusb.h"
-# include "virscsi.h"
-# include "cpu_conf.h"
-# include "driver.h"
-# include "virportallocator.h"
-# include "vircommand.h"
-# include "virthreadpool.h"
-# include "locking/lock_manager.h"
-# include "qemu_capabilities.h"
-# include "virclosecallbacks.h"
-# include "virhostdev.h"
-# include "virfile.h"
-# include "virfilecache.h"
-# include "virfirmware.h"
+#include "virebtables.h"
+#include "internal.h"
+#include "capabilities.h"
+#include "network_conf.h"
+#include "domain_conf.h"
+#include "snapshot_conf.h"
+#include "domain_event.h"
+#include "virthread.h"
+#include "security/security_manager.h"
+#include "virpci.h"
+#include "virusb.h"
+#include "virscsi.h"
+#include "cpu_conf.h"
+#include "driver.h"
+#include "virportallocator.h"
+#include "vircommand.h"
+#include "virthreadpool.h"
+#include "locking/lock_manager.h"
+#include "qemu_capabilities.h"
+#include "virclosecallbacks.h"
+#include "virhostdev.h"
+#include "virfile.h"
+#include "virfilecache.h"
+#include "virfirmware.h"

-# define QEMU_DRIVER_NAME "QEMU"
+#define QEMU_DRIVER_NAME "QEMU"

 typedef struct _virQEMUDriver virQEMUDriver;
 typedef virQEMUDriver *virQEMUDriverPtr;
@ -381,4 +380,3 @@ int qemuGetMemoryBackingPath(const virDomainDef *def,
                             virQEMUDriverConfigPtr cfg,
                             const char *alias,
                             char **memPath);
-#endif /* LIBVIRT_QEMU_CONF_H */
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@ -19,47 +19,46 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_DOMAIN_H
-# define LIBVIRT_QEMU_DOMAIN_H
+#pragma once

-# include "virthread.h"
-# include "vircgroup.h"
-# include "virperf.h"
-# include "domain_addr.h"
-# include "domain_conf.h"
-# include "snapshot_conf.h"
-# include "qemu_monitor.h"
-# include "qemu_agent.h"
-# include "qemu_blockjob.h"
-# include "qemu_conf.h"
-# include "qemu_capabilities.h"
-# include "qemu_migration_params.h"
-# include "virmdev.h"
-# include "virchrdev.h"
-# include "virobject.h"
-# include "logging/log_manager.h"
-# include "virdomainmomentobjlist.h"
-# include "virenum.h"
+#include "virthread.h"
+#include "vircgroup.h"
+#include "virperf.h"
+#include "domain_addr.h"
+#include "domain_conf.h"
+#include "snapshot_conf.h"
+#include "qemu_monitor.h"
+#include "qemu_agent.h"
+#include "qemu_blockjob.h"
+#include "qemu_conf.h"
+#include "qemu_capabilities.h"
+#include "qemu_migration_params.h"
+#include "virmdev.h"
+#include "virchrdev.h"
+#include "virobject.h"
+#include "logging/log_manager.h"
+#include "virdomainmomentobjlist.h"
+#include "virenum.h"

-# define QEMU_DOMAIN_FORMAT_LIVE_FLAGS \
+#define QEMU_DOMAIN_FORMAT_LIVE_FLAGS \
    (VIR_DOMAIN_XML_SECURE)

-# if ULONG_MAX == 4294967295
+#if ULONG_MAX == 4294967295
 /* QEMU has a 64-bit limit, but we are limited by our historical choice of
 * representing bandwidth in a long instead of a 64-bit int.  */
-#  define QEMU_DOMAIN_MIG_BANDWIDTH_MAX ULONG_MAX
-# else
-#  define QEMU_DOMAIN_MIG_BANDWIDTH_MAX (INT64_MAX / (1024 * 1024))
-# endif
+# define QEMU_DOMAIN_MIG_BANDWIDTH_MAX ULONG_MAX
+#else
+# define QEMU_DOMAIN_MIG_BANDWIDTH_MAX (INT64_MAX / (1024 * 1024))
+#endif

-# define JOB_MASK(job)                  (job == 0 ? 0 : 1 << (job - 1))
-# define QEMU_JOB_DEFAULT_MASK \
+#define JOB_MASK(job)                  (job == 0 ? 0 : 1 << (job - 1))
+#define QEMU_JOB_DEFAULT_MASK \
    (JOB_MASK(QEMU_JOB_QUERY) | \
     JOB_MASK(QEMU_JOB_DESTROY) | \
     JOB_MASK(QEMU_JOB_ABORT))

 /* Jobs which have to be tracked in domain state XML. */
-# define QEMU_DOMAIN_TRACK_JOBS \
+#define QEMU_DOMAIN_TRACK_JOBS \
    (JOB_MASK(QEMU_JOB_DESTROY) | \
     JOB_MASK(QEMU_JOB_ASYNC))

@ -205,7 +204,7 @@ struct _qemuDomainJobObj {
 typedef void (*qemuDomainCleanupCallback)(virQEMUDriverPtr driver,
                                          virDomainObjPtr vm);

-# define QEMU_DOMAIN_MASTER_KEY_LEN 32  /* 32 bytes for 256 bit random key */
+#define QEMU_DOMAIN_MASTER_KEY_LEN 32  /* 32 bytes for 256 bit random key */


 /* helper data types for async device unplug */
@ -249,8 +248,8 @@ struct _qemuDomainSecretPlain {
    size_t secretlen;
 };

-# define QEMU_DOMAIN_AES_IV_LEN 16   /* 16 bytes for 128 bit random */
-                                     /*    initialization vector */
+#define QEMU_DOMAIN_AES_IV_LEN 16   /* 16 bytes for 128 bit random */
+                                    /*    initialization vector */
 typedef struct _qemuDomainSecretAES qemuDomainSecretAES;
 typedef struct _qemuDomainSecretAES *qemuDomainSecretAESPtr;
 struct _qemuDomainSecretAES {
@ -383,10 +382,10 @@ struct _qemuDomainObjPrivate {
    bool memPrealloc;
 };

-# define QEMU_DOMAIN_PRIVATE(vm) \
+#define QEMU_DOMAIN_PRIVATE(vm) \
    ((qemuDomainObjPrivatePtr) (vm)->privateData)

-# define QEMU_DOMAIN_DISK_PRIVATE(disk) \
+#define QEMU_DOMAIN_DISK_PRIVATE(disk) \
    ((qemuDomainDiskPrivatePtr) (disk)->privateData)

 typedef struct _qemuDomainDiskPrivate qemuDomainDiskPrivate;
@ -410,7 +409,7 @@ struct _qemuDomainDiskPrivate {
    char *nodeCopyOnRead; /* nodename of the disk-wide copy-on-read blockdev layer */
 };

-# define QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src) \
+#define QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src) \
    ((qemuDomainStorageSourcePrivatePtr) (src)->privateData)

 typedef struct _qemuDomainStorageSourcePrivate qemuDomainStorageSourcePrivate;
@ -447,7 +446,7 @@ struct _qemuDomainVcpuPrivate {
    int vcpus;
 };

-# define QEMU_DOMAIN_VCPU_PRIVATE(vcpu) \
+#define QEMU_DOMAIN_VCPU_PRIVATE(vcpu) \
    ((qemuDomainVcpuPrivatePtr) (vcpu)->privateData)


@ -460,7 +459,7 @@ struct qemuDomainDiskInfo {
    char *nodename;
 };

-# define QEMU_DOMAIN_CHR_SOURCE_PRIVATE(dev) \
+#define QEMU_DOMAIN_CHR_SOURCE_PRIVATE(dev) \
    ((qemuDomainChrSourcePrivatePtr) (dev)->privateData)

 typedef struct _qemuDomainChrSourcePrivate qemuDomainChrSourcePrivate;
@ -483,7 +482,7 @@ struct _qemuDomainVsockPrivate {
 };


-# define QEMU_DOMAIN_GRAPHICS_PRIVATE(dev) \
+#define QEMU_DOMAIN_GRAPHICS_PRIVATE(dev) \
    ((qemuDomainGraphicsPrivatePtr) (dev)->privateData)

 typedef struct _qemuDomainGraphicsPrivate qemuDomainGraphicsPrivate;
@ -1128,5 +1127,3 @@ qemuDomainNVRAMPathGenerate(virQEMUDriverConfigPtr cfg,

 virDomainEventSuspendedDetailType
 qemuDomainPausedReasonToSuspendedEvent(virDomainPausedReason reason);
-
-#endif /* LIBVIRT_QEMU_DOMAIN_H */
--- a/src/qemu/qemu_domain_address.h
+++ b/src/qemu/qemu_domain_address.h
@ -19,13 +19,12 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_DOMAIN_ADDRESS_H
-# define LIBVIRT_QEMU_DOMAIN_ADDRESS_H
+#pragma once

-# include "domain_addr.h"
-# include "domain_conf.h"
-# include "qemu_conf.h"
-# include "qemu_capabilities.h"
+#include "domain_addr.h"
+#include "domain_conf.h"
+#include "qemu_conf.h"
+#include "qemu_capabilities.h"

 int qemuDomainGetSCSIControllerModel(const virDomainDef *def,
                                     const virDomainControllerDef *cont,
@ -64,5 +63,3 @@ int qemuDomainEnsureVirtioAddress(bool *releaseAddr,
                                  virDomainObjPtr vm,
                                  virDomainDeviceDefPtr dev,
                                  const char *devicename);
-
-#endif /* LIBVIRT_QEMU_DOMAIN_ADDRESS_H */
--- a/src/qemu/qemu_driver.h
+++ b/src/qemu/qemu_driver.h
@ -19,9 +19,6 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_DRIVER_H
-# define LIBVIRT_QEMU_DRIVER_H
+#pragma once

 int qemuRegister(void);
-
-#endif /* LIBVIRT_QEMU_DRIVER_H */
--- a/src/qemu/qemu_extdevice.h
+++ b/src/qemu/qemu_extdevice.h
@ -18,11 +18,10 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_EXTDEVICE_H
-# define LIBVIRT_QEMU_EXTDEVICE_H
+#pragma once

-# include "qemu_conf.h"
-# include "qemu_domain.h"
+#include "qemu_conf.h"
+#include "qemu_domain.h"

 int qemuExtDeviceLogCommand(qemuDomainLogContextPtr logCtxt,
                            virCommandPtr cmd,
@ -54,5 +53,3 @@ bool qemuExtDevicesHasDevice(virDomainDefPtr def);
 int qemuExtDevicesSetupCgroup(virQEMUDriverPtr driver,
                              virDomainDefPtr def,
                              virCgroupPtr cgroup);
-
-#endif /* LIBVIRT_QEMU_EXTDEVICE_H */
--- a/src/qemu/qemu_firmware.h
+++ b/src/qemu/qemu_firmware.h
@ -18,13 +18,12 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_FIRMWARE_H
-# define LIBVIRT_QEMU_FIRMWARE_H
+#pragma once

-# include "domain_conf.h"
-# include "qemu_conf.h"
-# include "virautoclean.h"
-# include "virarch.h"
+#include "domain_conf.h"
+#include "qemu_conf.h"
+#include "virautoclean.h"
+#include "virarch.h"

 typedef struct _qemuFirmware qemuFirmware;
 typedef qemuFirmware *qemuFirmwarePtr;
@ -57,5 +56,3 @@ qemuFirmwareGetSupported(const char *machine,
                         bool *secure);

 verify(VIR_DOMAIN_OS_DEF_FIRMWARE_LAST <= 64);
-
-#endif /* LIBVIRT_QEMU_FIRMWARE_H */
--- a/src/qemu/qemu_hostdev.h
+++ b/src/qemu/qemu_hostdev.h
@ -19,11 +19,10 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_HOSTDEV_H
-# define LIBVIRT_QEMU_HOSTDEV_H
+#pragma once

-# include "qemu_conf.h"
-# include "domain_conf.h"
+#include "qemu_conf.h"
+#include "domain_conf.h"

 bool qemuHostdevHostSupportsPassthroughLegacy(void);
 bool qemuHostdevHostSupportsPassthroughVFIO(void);
@ -90,5 +89,3 @@ void qemuHostdevReAttachMediatedDevices(virQEMUDriverPtr driver,
                                        int nhostdevs);
 void qemuHostdevReAttachDomainDevices(virQEMUDriverPtr driver,
                                      virDomainDefPtr def);
-
-#endif /* LIBVIRT_QEMU_HOSTDEV_H */
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@ -19,12 +19,11 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_HOTPLUG_H
-# define LIBVIRT_QEMU_HOTPLUG_H
+#pragma once

-# include "qemu_conf.h"
-# include "qemu_domain.h"
-# include "domain_conf.h"
+#include "qemu_conf.h"
+#include "qemu_domain.h"
+#include "domain_conf.h"

 int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
                                   virDomainObjPtr vm,
@ -151,5 +150,3 @@ int qemuDomainSetVcpuInternal(virQEMUDriverPtr driver,
                              virDomainDefPtr persistentDef,
                              virBitmapPtr vcpus,
                              bool state);
-
-#endif /* LIBVIRT_QEMU_HOTPLUG_H */
--- a/src/qemu/qemu_hotplugpriv.h
+++ b/src/qemu/qemu_hotplugpriv.h
@ -23,13 +23,10 @@
 # error "qemu_hotplugpriv.h may only be included by qemu_hotplug.c or test suites"
 #endif /* LIBVIRT_QEMU_HOTPLUGPRIV_H_ALLOW */

-#ifndef LIBVIRT_QEMU_HOTPLUGPRIV_H
-# define LIBVIRT_QEMU_HOTPLUGPRIV_H
+#pragma once

 /*
 * This header file should never be used outside unit tests.
 */

 extern unsigned long long qemuDomainRemoveDeviceWaitTime;
-
-#endif /* LIBVIRT_QEMU_HOTPLUGPRIV_H */
--- a/src/qemu/qemu_interface.h
+++ b/src/qemu/qemu_interface.h
@ -19,12 +19,11 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_INTERFACE_H
-# define LIBVIRT_QEMU_INTERFACE_H
+#pragma once

-# include "domain_conf.h"
-# include "qemu_conf.h"
-# include "qemu_domain.h"
+#include "domain_conf.h"
+#include "qemu_conf.h"
+#include "qemu_domain.h"

 int qemuInterfaceStartDevice(virDomainNetDefPtr net);
 int qemuInterfaceStartDevices(virDomainDefPtr def);
@ -55,4 +54,3 @@ int qemuInterfaceOpenVhostNet(virDomainDefPtr def,
                              virDomainNetDefPtr net,
                              int *vhostfd,
                              size_t *vhostfdSize);
-#endif /* LIBVIRT_QEMU_INTERFACE_H */
--- a/src/qemu/qemu_migration.h
+++ b/src/qemu/qemu_migration.h
@ -19,13 +19,12 @@
 *
 */

-#ifndef LIBVIRT_QEMU_MIGRATION_H
-# define LIBVIRT_QEMU_MIGRATION_H
+#pragma once

-# include "qemu_conf.h"
-# include "qemu_domain.h"
-# include "qemu_migration_params.h"
-# include "virenum.h"
+#include "qemu_conf.h"
+#include "qemu_domain.h"
+#include "qemu_migration_params.h"
+#include "virenum.h"

 /*
 * General function naming conventions:
@ -41,7 +40,7 @@
 */

 /* All supported qemu migration flags.  */
-# define QEMU_MIGRATION_FLAGS \
+#define QEMU_MIGRATION_FLAGS \
    (VIR_MIGRATE_LIVE | \
     VIR_MIGRATE_PEER2PEER | \
     VIR_MIGRATE_TUNNELLED | \
@ -63,7 +62,7 @@
     0)

 /* All supported migration parameters and their types. */
-# define QEMU_MIGRATION_PARAMETERS \
+#define QEMU_MIGRATION_PARAMETERS \
    VIR_MIGRATE_PARAM_URI,              VIR_TYPED_PARAM_STRING, \
    VIR_MIGRATE_PARAM_DEST_NAME,        VIR_TYPED_PARAM_STRING, \
    VIR_MIGRATE_PARAM_DEST_XML,         VIR_TYPED_PARAM_STRING, \
@ -254,5 +253,3 @@ qemuMigrationSrcFetchMirrorStats(virQEMUDriverPtr driver,
                                 virDomainObjPtr vm,
                                 qemuDomainAsyncJob asyncJob,
                                 qemuDomainJobInfoPtr jobInfo);
-
-#endif /* LIBVIRT_QEMU_MIGRATION_H */
--- a/src/qemu/qemu_migration_cookie.h
+++ b/src/qemu/qemu_migration_cookie.h
@ -16,11 +16,10 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_MIGRATION_COOKIE_H
-# define LIBVIRT_QEMU_MIGRATION_COOKIE_H
+#pragma once

-# include "qemu_migration_params.h"
-# include "virenum.h"
+#include "qemu_migration_params.h"
+#include "virenum.h"

 typedef enum {
    QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS,
@ -177,5 +176,3 @@ qemuMigrationCookieAddPersistent(qemuMigrationCookiePtr mig,

 virDomainDefPtr
 qemuMigrationCookieGetPersistent(qemuMigrationCookiePtr mig);
-
-#endif /* LIBVIRT_QEMU_MIGRATION_COOKIE_H */
--- a/src/qemu/qemu_migration_params.h
+++ b/src/qemu/qemu_migration_params.h
@ -19,17 +19,16 @@
 *
 */

-#ifndef LIBVIRT_QEMU_MIGRATION_PARAMS_H
-# define LIBVIRT_QEMU_MIGRATION_PARAMS_H
+#pragma once

-# include "internal.h"
+#include "internal.h"

-# include "virbuffer.h"
-# include "virxml.h"
-# include "qemu_monitor.h"
-# include "qemu_conf.h"
-# include "virautoclean.h"
-# include "virenum.h"
+#include "virbuffer.h"
+#include "virxml.h"
+#include "qemu_monitor.h"
+#include "qemu_conf.h"
+#include "virautoclean.h"
+#include "virenum.h"

 typedef enum {
    QEMU_MIGRATION_CAP_XBZRLE,
@ -161,5 +160,3 @@ qemuMigrationCapsCheck(virQEMUDriverPtr driver,
 bool
 qemuMigrationCapsGet(virDomainObjPtr vm,
                     qemuMigrationCapability cap);
-
-#endif /* LIBVIRT_QEMU_MIGRATION_PARAMS_H */
--- a/src/qemu/qemu_migration_paramspriv.h
+++ b/src/qemu/qemu_migration_paramspriv.h
@ -23,8 +23,7 @@
 # error "qemu_migration_paramspriv.h may only be included by qemu_migration_params.c or test suites"
 #endif /* LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW */

-#ifndef LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H
-# define LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H
+#pragma once

 virJSONValuePtr
 qemuMigrationParamsToJSON(qemuMigrationParamsPtr migParams);
@ -35,5 +34,3 @@ qemuMigrationParamsFromJSON(virJSONValuePtr params);
 virJSONValuePtr
 qemuMigrationCapsToJSON(virBitmapPtr caps,
                        virBitmapPtr states);
-
-#endif /* LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H */
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@ -19,20 +19,19 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_MONITOR_H
-# define LIBVIRT_QEMU_MONITOR_H
+#pragma once

-# include "internal.h"
+#include "internal.h"

-# include "domain_conf.h"
-# include "virbitmap.h"
-# include "virhash.h"
-# include "virjson.h"
-# include "virnetdev.h"
-# include "device_conf.h"
-# include "cpu/cpu.h"
-# include "util/virgic.h"
-# include "virenum.h"
+#include "domain_conf.h"
+#include "virbitmap.h"
+#include "virhash.h"
+#include "virjson.h"
+#include "virnetdev.h"
+#include "device_conf.h"
+#include "cpu/cpu.h"
+#include "util/virgic.h"
+#include "virenum.h"

 typedef struct _qemuMonitor qemuMonitor;
 typedef qemuMonitor *qemuMonitorPtr;
@ -388,7 +387,7 @@ int qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon,
                                const char *cmd,
                                int scm_fd,
                                char **reply);
-# define qemuMonitorHMPCommand(mon, cmd, reply) \
+#define qemuMonitorHMPCommand(mon, cmd, reply) \
    qemuMonitorHMPCommandWithFd(mon, cmd, -1, reply)

 int qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event,
@ -1252,5 +1251,3 @@ struct _qemuMonitorCurrentMachineInfo {

 int qemuMonitorGetCurrentMachineInfo(qemuMonitorPtr mon,
                                     qemuMonitorCurrentMachineInfoPtr info);
-
-#endif /* LIBVIRT_QEMU_MONITOR_H */
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@ -19,15 +19,14 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_MONITOR_JSON_H
-# define LIBVIRT_QEMU_MONITOR_JSON_H
+#pragma once

-# include "internal.h"
+#include "internal.h"

-# include "qemu_monitor.h"
-# include "virbitmap.h"
-# include "cpu/cpu.h"
-# include "util/virgic.h"
+#include "qemu_monitor.h"
+#include "virbitmap.h"
+#include "cpu/cpu.h"
+#include "util/virgic.h"

 int qemuMonitorJSONTransactionAdd(virJSONValuePtr actions,
                                  const char *cmdname,
@ -600,5 +599,3 @@ int qemuMonitorJSONMergeBitmaps(qemuMonitorPtr mon,
 int qemuMonitorJSONDeleteBitmap(qemuMonitorPtr mon,
                                const char *node,
                                const char *bitmap);
-
-#endif /* LIBVIRT_QEMU_MONITOR_JSON_H */
--- a/src/qemu/qemu_monitor_priv.h
+++ b/src/qemu/qemu_monitor_priv.h
@ -20,12 +20,9 @@
 # error "qemu_monitor_priv.h may only be included by qemu_monitor.c or test suites"
 #endif /* LIBVIRT_QEMU_MONITOR_PRIV_H_ALLOW */

-#ifndef LIBVIRT_QEMU_MONITOR_PRIV_H
-# define LIBVIRT_QEMU_MONITOR_PRIV_H
+#pragma once

-# include "qemu_monitor.h"
+#include "qemu_monitor.h"

 void
 qemuMonitorResetCommandID(qemuMonitorPtr mon);
-
-#endif /* LIBVIRT_QEMU_MONITOR_PRIV_H */
--- a/src/qemu/qemu_monitor_text.h
+++ b/src/qemu/qemu_monitor_text.h
@ -19,12 +19,11 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_MONITOR_TEXT_H
-# define LIBVIRT_QEMU_MONITOR_TEXT_H
+#pragma once

-# include "internal.h"
+#include "internal.h"

-# include "qemu_monitor.h"
+#include "qemu_monitor.h"

 int qemuMonitorTextSetCPU(qemuMonitorPtr mon, int cpu, bool online);

@ -37,5 +36,3 @@ int qemuMonitorTextDriveDel(qemuMonitorPtr mon,
 int qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, const char *name);
 int qemuMonitorTextLoadSnapshot(qemuMonitorPtr mon, const char *name);
 int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon, const char *name);
-
-#endif /* LIBVIRT_QEMU_MONITOR_TEXT_H */
--- a/src/qemu/qemu_parse_command.h
+++ b/src/qemu/qemu_parse_command.h
@ -19,12 +19,11 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_PARSE_COMMAND_H
-# define LIBVIRT_QEMU_PARSE_COMMAND_H
+#pragma once

-# include "virfilecache.h"
+#include "virfilecache.h"

-# define QEMU_QXL_VGAMEM_DEFAULT 16 * 1024
+#define QEMU_QXL_VGAMEM_DEFAULT 16 * 1024

 /*
 * NB: def->name can be NULL upon return and the caller
@ -56,5 +55,3 @@ qemuParseKeywords(const char *str,
                  char ***retvalues,
                  int *retnkeywords,
                  int allowEmptyValue);
-
-#endif /* LIBVIRT_QEMU_PARSE_COMMAND_H */
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@ -19,12 +19,11 @@
 *
 */

-#ifndef LIBVIRT_QEMU_PROCESS_H
-# define LIBVIRT_QEMU_PROCESS_H
+#pragma once

-# include "qemu_conf.h"
-# include "qemu_domain.h"
-# include "virstoragefile.h"
+#include "qemu_conf.h"
+#include "qemu_domain.h"
+#include "virstoragefile.h"

 int qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr monConfig,
                                 const char *domainDir);
@ -242,5 +241,3 @@ qemuProcessQMPPtr qemuProcessQMPNew(const char *binary,
 void qemuProcessQMPFree(qemuProcessQMPPtr proc);

 int qemuProcessQMPStart(qemuProcessQMPPtr proc);
-
-#endif /* LIBVIRT_QEMU_PROCESS_H */
--- a/src/qemu/qemu_processpriv.h
+++ b/src/qemu/qemu_processpriv.h
@ -23,11 +23,10 @@
 # error "qemu_process_priv.h may only be included by qemu_process.c or test suites"
 #endif /* LIBVIRT_QEMU_PROCESSPRIV_H_ALLOW */

-#ifndef LIBVIRT_QEMU_PROCESSPRIV_H
-# define LIBVIRT_QEMU_PROCESSPRIV_H
+#pragma once

-# include "domain_conf.h"
-# include "qemu_monitor.h"
+#include "domain_conf.h"
+#include "qemu_monitor.h"

 /*
 * This header file should never be used outside unit tests.
@ -39,5 +38,3 @@ int qemuProcessHandleDeviceDeleted(qemuMonitorPtr mon,
                                   void *opaque);

 int qemuProcessQMPInitMonitor(qemuMonitorPtr mon);
-
-#endif /* LIBVIRT_QEMU_PROCESSPRIV_H */
--- a/src/qemu/qemu_qapi.h
+++ b/src/qemu/qemu_qapi.h
@ -16,13 +16,12 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_QAPI_H
-# define LIBVIRT_QEMU_QAPI_H
+#pragma once

-# include "internal.h"
+#include "internal.h"

-# include "virhash.h"
-# include "virjson.h"
+#include "virhash.h"
+#include "virjson.h"

 int
 virQEMUQAPISchemaPathGet(const char *query,
@ -35,6 +34,3 @@ virQEMUQAPISchemaPathExists(const char *query,

 virHashTablePtr
 virQEMUQAPISchemaConvert(virJSONValuePtr schemareply);
-
-
-#endif /* LIBVIRT_QEMU_QAPI_H */
--- a/src/qemu/qemu_security.h
+++ b/src/qemu/qemu_security.h
@ -18,13 +18,11 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_SECURITY_H
-# define LIBVIRT_QEMU_SECURITY_H
+#pragma once

-
-# include "qemu_conf.h"
-# include "domain_conf.h"
-# include "security/security_manager.h"
+#include "qemu_conf.h"
+#include "domain_conf.h"
+#include "security/security_manager.h"

 int qemuSecuritySetAllLabel(virQEMUDriverPtr driver,
                            virDomainObjPtr vm,
@ -101,28 +99,26 @@ int qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr driver,
 /* Please note that for these APIs there is no wrapper yet. Do NOT blindly add
 * new APIs here. If an API can touch a file add a proper wrapper instead.
 */
-# define qemuSecurityCheckAllLabel virSecurityManagerCheckAllLabel
-# define qemuSecurityClearSocketLabel virSecurityManagerClearSocketLabel
-# define qemuSecurityGenLabel virSecurityManagerGenLabel
-# define qemuSecurityGetBaseLabel virSecurityManagerGetBaseLabel
-# define qemuSecurityGetDOI virSecurityManagerGetDOI
-# define qemuSecurityGetModel virSecurityManagerGetModel
-# define qemuSecurityGetMountOptions virSecurityManagerGetMountOptions
-# define qemuSecurityGetNested virSecurityManagerGetNested
-# define qemuSecurityGetProcessLabel virSecurityManagerGetProcessLabel
-# define qemuSecurityNew virSecurityManagerNew
-# define qemuSecurityNewDAC virSecurityManagerNewDAC
-# define qemuSecurityNewStack virSecurityManagerNewStack
-# define qemuSecurityPostFork virSecurityManagerPostFork
-# define qemuSecurityPreFork virSecurityManagerPreFork
-# define qemuSecurityReleaseLabel virSecurityManagerReleaseLabel
-# define qemuSecurityReserveLabel virSecurityManagerReserveLabel
-# define qemuSecuritySetChildProcessLabel virSecurityManagerSetChildProcessLabel
-# define qemuSecuritySetDaemonSocketLabel virSecurityManagerSetDaemonSocketLabel
-# define qemuSecuritySetImageFDLabel virSecurityManagerSetImageFDLabel
-# define qemuSecuritySetSocketLabel virSecurityManagerSetSocketLabel
-# define qemuSecuritySetTapFDLabel virSecurityManagerSetTapFDLabel
-# define qemuSecurityStackAddNested virSecurityManagerStackAddNested
-# define qemuSecurityVerify virSecurityManagerVerify
-
-#endif /* LIBVIRT_QEMU_SECURITY_H */
+#define qemuSecurityCheckAllLabel virSecurityManagerCheckAllLabel
+#define qemuSecurityClearSocketLabel virSecurityManagerClearSocketLabel
+#define qemuSecurityGenLabel virSecurityManagerGenLabel
+#define qemuSecurityGetBaseLabel virSecurityManagerGetBaseLabel
+#define qemuSecurityGetDOI virSecurityManagerGetDOI
+#define qemuSecurityGetModel virSecurityManagerGetModel
+#define qemuSecurityGetMountOptions virSecurityManagerGetMountOptions
+#define qemuSecurityGetNested virSecurityManagerGetNested
+#define qemuSecurityGetProcessLabel virSecurityManagerGetProcessLabel
+#define qemuSecurityNew virSecurityManagerNew
+#define qemuSecurityNewDAC virSecurityManagerNewDAC
+#define qemuSecurityNewStack virSecurityManagerNewStack
+#define qemuSecurityPostFork virSecurityManagerPostFork
+#define qemuSecurityPreFork virSecurityManagerPreFork
+#define qemuSecurityReleaseLabel virSecurityManagerReleaseLabel
+#define qemuSecurityReserveLabel virSecurityManagerReserveLabel
+#define qemuSecuritySetChildProcessLabel virSecurityManagerSetChildProcessLabel
+#define qemuSecuritySetDaemonSocketLabel virSecurityManagerSetDaemonSocketLabel
+#define qemuSecuritySetImageFDLabel virSecurityManagerSetImageFDLabel
+#define qemuSecuritySetSocketLabel virSecurityManagerSetSocketLabel
+#define qemuSecuritySetTapFDLabel virSecurityManagerSetTapFDLabel
+#define qemuSecurityStackAddNested virSecurityManagerStackAddNested
+#define qemuSecurityVerify virSecurityManagerVerify
--- a/src/qemu/qemu_tpm.h
+++ b/src/qemu/qemu_tpm.h
@ -18,10 +18,9 @@
 * <http://www.gnu.org/licenses/>.
 */

-#ifndef LIBVIRT_QEMU_TPM_H
-# define LIBVIRT_QEMU_TPM_H
+#pragma once

-# include "vircommand.h"
+#include "vircommand.h"

 int qemuExtTPMInitPaths(virQEMUDriverPtr driver,
                        virDomainDefPtr def)
@ -51,5 +50,3 @@ int qemuExtTPMSetupCgroup(virQEMUDriverPtr driver,
                          virCgroupPtr cgroup)
    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
    ATTRIBUTE_RETURN_CHECK;
-
-#endif /* LIBVIRT_QEMU_TPM_H */