util: host: 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>
This commit is contained in:
Jonathon Jongsma 2019-06-18 11:12:52 -05:00 committed by Ján Tomko
parent 4b72307b2f
commit 2edd1c1d86
4 changed files with 21 additions and 33 deletions

View File

@ -19,13 +19,12 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_VIRHOSTCPU_H #pragma once
# define LIBVIRT_VIRHOSTCPU_H
# include "internal.h" #include "internal.h"
# include "virarch.h" #include "virarch.h"
# include "virbitmap.h" #include "virbitmap.h"
# include "virenum.h" #include "virenum.h"
typedef struct _virHostCPUTscInfo virHostCPUTscInfo; typedef struct _virHostCPUTscInfo virHostCPUTscInfo;
@ -64,12 +63,12 @@ int virHostCPUStatsAssign(virNodeCPUStatsPtr param,
const char *name, const char *name,
unsigned long long value); unsigned long long value);
# ifdef __linux__ #ifdef __linux__
int virHostCPUGetSocket(unsigned int cpu, unsigned int *socket); int virHostCPUGetSocket(unsigned int cpu, unsigned int *socket);
int virHostCPUGetCore(unsigned int cpu, unsigned int *core); int virHostCPUGetCore(unsigned int cpu, unsigned int *core);
virBitmapPtr virHostCPUGetSiblingsList(unsigned int cpu); virBitmapPtr virHostCPUGetSiblingsList(unsigned int cpu);
# endif #endif
int virHostCPUGetOnline(unsigned int cpu, bool *online); int virHostCPUGetOnline(unsigned int cpu, bool *online);
@ -79,5 +78,3 @@ int virHostCPUGetMSR(unsigned long index,
uint64_t *msr); uint64_t *msr);
virHostCPUTscInfoPtr virHostCPUGetTscInfo(void); virHostCPUTscInfoPtr virHostCPUGetTscInfo(void);
#endif /* LIBVIRT_VIRHOSTCPU_H */

View File

@ -23,12 +23,11 @@
# error "virhostcpupriv.h may only be included by virhostcpu.c or test suites" # error "virhostcpupriv.h may only be included by virhostcpu.c or test suites"
#endif /* LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW */ #endif /* LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW */
#ifndef LIBVIRT_VIRHOSTCPUPRIV_H #pragma once
# define LIBVIRT_VIRHOSTCPUPRIV_H
# include "virhostcpu.h" #include "virhostcpu.h"
# ifdef __linux__ #ifdef __linux__
int virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, int virHostCPUGetInfoPopulateLinux(FILE *cpuinfo,
virArch arch, virArch arch,
unsigned int *cpus, unsigned int *cpus,
@ -42,6 +41,4 @@ int virHostCPUGetStatsLinux(FILE *procstat,
int cpuNum, int cpuNum,
virNodeCPUStatsPtr params, virNodeCPUStatsPtr params,
int *nparams); int *nparams);
# endif #endif
#endif /* LIBVIRT_VIRHOSTCPUPRIV_H */

View File

@ -19,17 +19,16 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_VIRHOSTDEV_H #pragma once
# define LIBVIRT_VIRHOSTDEV_H
# include "internal.h" #include "internal.h"
# include "virpci.h" #include "virpci.h"
# include "virusb.h" #include "virusb.h"
# include "virscsi.h" #include "virscsi.h"
# include "virscsivhost.h" #include "virscsivhost.h"
# include "conf/domain_conf.h" #include "conf/domain_conf.h"
# include "virmdev.h" #include "virmdev.h"
typedef enum { typedef enum {
VIR_HOSTDEV_STRICT_ACS_CHECK = (1 << 0), /* strict acs check */ VIR_HOSTDEV_STRICT_ACS_CHECK = (1 << 0), /* strict acs check */
@ -202,5 +201,3 @@ int virHostdevPCINodeDeviceReAttach(virHostdevManagerPtr mgr,
int virHostdevPCINodeDeviceReset(virHostdevManagerPtr mgr, int virHostdevPCINodeDeviceReset(virHostdevManagerPtr mgr,
virPCIDevicePtr pci) virPCIDevicePtr pci)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
#endif /* LIBVIRT_VIRHOSTDEV_H */

View File

@ -19,10 +19,9 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_VIRHOSTMEM_H #pragma once
# define LIBVIRT_VIRHOSTMEM_H
# include "internal.h" #include "internal.h"
int virHostMemGetStats(int cellNum, int virHostMemGetStats(int cellNum,
virNodeMemoryStatsPtr params, virNodeMemoryStatsPtr params,
@ -54,5 +53,3 @@ int virHostMemAllocPages(unsigned int npages,
int startCell, int startCell,
unsigned int cellCount, unsigned int cellCount,
bool add); bool add);
#endif /* LIBVIRT_VIRHOSTMEM_H */