diff --git a/src/vz/vz_driver.h b/src/vz/vz_driver.h index 593a585075cfc36f21c5c60c8005e23bc3ad58d5..ce75b11c04b9a5dfad0bc258eff926885213d421 100644 --- a/src/vz/vz_driver.h +++ b/src/vz/vz_driver.h @@ -20,9 +20,6 @@ * */ -#ifndef LIBVIRT_VZ_DRIVER_H -# define LIBVIRT_VZ_DRIVER_H +#pragma once int vzRegister(void); - -#endif /* LIBVIRT_VZ_DRIVER_H */ diff --git a/src/vz/vz_sdk.h b/src/vz/vz_sdk.h index e412b821bbf9ddc4527b61d04a265d3cc4576fc2..5acee2ca9da023e947b3e58cd139f53dec0321e6 100644 --- a/src/vz/vz_sdk.h +++ b/src/vz/vz_sdk.h @@ -20,12 +20,11 @@ * */ -#ifndef LIBVIRT_VZ_SDK_H -# define LIBVIRT_VZ_SDK_H +#pragma once -# include +#include -# include "vz_utils.h" +#include "vz_utils.h" int prlsdkInit(void); void prlsdkDeinit(void); @@ -94,5 +93,3 @@ PRL_HANDLE prlsdkSdkDomainLookupByName(vzDriverPtr driver, const char *name); int prlsdkCancelJob(virDomainObjPtr dom); int prlsdkResizeImage(virDomainObjPtr dom, virDomainDiskDefPtr disk, unsigned long long newsize); - -#endif /* LIBVIRT_VZ_SDK_H */ diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index fb289ed4a725a4857db7ea3218bf5ba5753c5ff3..d9e3ebc30a7f89f83bd5eace4ba4df319a260d03 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -20,27 +20,26 @@ * */ -#ifndef LIBVIRT_VZ_UTILS_H -# define LIBVIRT_VZ_UTILS_H +#pragma once -# include +#include -# include "driver.h" -# include "conf/domain_conf.h" -# include "conf/snapshot_conf.h" -# include "conf/virdomainsnapshotobjlist.h" -# include "conf/virdomainobjlist.h" -# include "conf/domain_event.h" -# include "virthread.h" -# include "datatypes.h" +#include "driver.h" +#include "conf/domain_conf.h" +#include "conf/snapshot_conf.h" +#include "conf/virdomainsnapshotobjlist.h" +#include "conf/virdomainobjlist.h" +#include "conf/domain_event.h" +#include "virthread.h" +#include "datatypes.h" -# define vzParseError() \ +#define vzParseError() \ virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__, \ __FUNCTION__, __LINE__, _("Can't parse prlctl output")) -# define IS_CT(def) (def->os.type == VIR_DOMAIN_OSTYPE_EXE) +#define IS_CT(def) (def->os.type == VIR_DOMAIN_OSTYPE_EXE) -# define vzDomNotFoundError(domain) \ +#define vzDomNotFoundError(domain) \ do { \ char uuidstr[VIR_UUID_STRING_BUFLEN]; \ virUUIDFormat(domain->uuid, uuidstr); \ @@ -48,8 +47,8 @@ _("no domain with matching uuid '%s'"), uuidstr); \ } while (0) -# define PARALLELS_DOMAIN_ROUTED_NETWORK_NAME "host-routed" -# define VIRTUOZZO_VER_7 ((unsigned long)7000000) +#define PARALLELS_DOMAIN_ROUTED_NETWORK_NAME "host-routed" +#define VIRTUOZZO_VER_7 ((unsigned long)7000000) struct _vzCapabilities { virStorageFileFormat vmDiskFormat; @@ -62,7 +61,7 @@ typedef struct _vzCapabilities vzCapabilities; typedef struct _vzCapabilities *vzCapabilitiesPtr; /* +2 to keep enclosing { and } */ -# define VIR_UUID_STRING_BRACED_BUFLEN (VIR_UUID_STRING_BUFLEN + 2) +#define VIR_UUID_STRING_BRACED_BUFLEN (VIR_UUID_STRING_BUFLEN + 2) struct _vzDriver { virObjectLockable parent; @@ -146,7 +145,7 @@ vzGetDefaultSCSIModel(vzDriverPtr driver, int vzCheckUnsupportedGraphics(virDomainGraphicsDefPtr gr); -# define PARALLELS_BLOCK_STATS_FOREACH(OP) \ + define PARALLELS_BLOCK_STATS_FOREACH(OP) \ OP(rd_req, VIR_DOMAIN_BLOCK_STATS_READ_REQ, "read_requests") \ OP(rd_bytes, VIR_DOMAIN_BLOCK_STATS_READ_BYTES, "read_total") \ OP(wr_req, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "write_requests") \ @@ -158,5 +157,3 @@ void vzDomainObjEndJob(virDomainObjPtr dom); int vzDomainJobUpdateTime(vzDomainJobObjPtr job); - -#endif /* LIBVIRT_VZ_UTILS_H */