NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

src/vz: use #pragma once in headers

Browse Source 
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:13:12 -05:00 committed by Ján Tomko
parent adfe09bc05
commit faceedaf71
3 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vz/vz_driver.h
View File

@ -20,9 +20,6 @@
* *
*/ */
#ifndef LIBVIRT_VZ_DRIVER_H #pragma once
# define LIBVIRT_VZ_DRIVER_H
int vzRegister(void); int vzRegister(void);
#endif /* LIBVIRT_VZ_DRIVER_H */

9
src/vz/vz_sdk.h
View File

@ -20,12 +20,11 @@
* *
*/ */
#ifndef LIBVIRT_VZ_SDK_H #pragma once
# define LIBVIRT_VZ_SDK_H
# include <Parallels.h> #include <Parallels.h>
# include "vz_utils.h" #include "vz_utils.h"
int prlsdkInit(void); int prlsdkInit(void);
void prlsdkDeinit(void); void prlsdkDeinit(void);
@ -94,5 +93,3 @@ PRL_HANDLE
prlsdkSdkDomainLookupByName(vzDriverPtr driver, const char *name); prlsdkSdkDomainLookupByName(vzDriverPtr driver, const char *name);
int prlsdkCancelJob(virDomainObjPtr dom); int prlsdkCancelJob(virDomainObjPtr dom);
int prlsdkResizeImage(virDomainObjPtr dom, virDomainDiskDefPtr disk, unsigned long long newsize); int prlsdkResizeImage(virDomainObjPtr dom, virDomainDiskDefPtr disk, unsigned long long newsize);
#endif /* LIBVIRT_VZ_SDK_H */

37
src/vz/vz_utils.h
View File

@ -20,27 +20,26 @@
* *
*/ */
#ifndef LIBVIRT_VZ_UTILS_H #pragma once
# define LIBVIRT_VZ_UTILS_H
# include <Parallels.h> #include <Parallels.h>
# include "driver.h" #include "driver.h"
# include "conf/domain_conf.h" #include "conf/domain_conf.h"
# include "conf/snapshot_conf.h" #include "conf/snapshot_conf.h"
# include "conf/virdomainsnapshotobjlist.h" #include "conf/virdomainsnapshotobjlist.h"
# include "conf/virdomainobjlist.h" #include "conf/virdomainobjlist.h"
# include "conf/domain_event.h" #include "conf/domain_event.h"
# include "virthread.h" #include "virthread.h"
# include "datatypes.h" #include "datatypes.h"
# define vzParseError() \ #define vzParseError() \
virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__, \ virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__, \
__FUNCTION__, __LINE__, _("Can't parse prlctl output")) __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 { \ do { \
char uuidstr[VIR_UUID_STRING_BUFLEN]; \ char uuidstr[VIR_UUID_STRING_BUFLEN]; \
virUUIDFormat(domain->uuid, uuidstr); \ virUUIDFormat(domain->uuid, uuidstr); \
@ -48,8 +47,8 @@
_("no domain with matching uuid '%s'"), uuidstr); \ _("no domain with matching uuid '%s'"), uuidstr); \
} while (0) } while (0)
# define PARALLELS_DOMAIN_ROUTED_NETWORK_NAME "host-routed" #define PARALLELS_DOMAIN_ROUTED_NETWORK_NAME "host-routed"
# define VIRTUOZZO_VER_7 ((unsigned long)7000000) #define VIRTUOZZO_VER_7 ((unsigned long)7000000)
struct _vzCapabilities { struct _vzCapabilities {
virStorageFileFormat vmDiskFormat; virStorageFileFormat vmDiskFormat;
@ -62,7 +61,7 @@ typedef struct _vzCapabilities vzCapabilities;
typedef struct _vzCapabilities *vzCapabilitiesPtr; typedef struct _vzCapabilities *vzCapabilitiesPtr;
/* +2 to keep enclosing { and } */ /* +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 { struct _vzDriver {
virObjectLockable parent; virObjectLockable parent;
@ -146,7 +145,7 @@ vzGetDefaultSCSIModel(vzDriverPtr driver,
int vzCheckUnsupportedGraphics(virDomainGraphicsDefPtr gr); 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_req, VIR_DOMAIN_BLOCK_STATS_READ_REQ, "read_requests") \
OP(rd_bytes, VIR_DOMAIN_BLOCK_STATS_READ_BYTES, "read_total") \ OP(rd_bytes, VIR_DOMAIN_BLOCK_STATS_READ_BYTES, "read_total") \
OP(wr_req, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "write_requests") \ OP(wr_req, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "write_requests") \
@ -158,5 +157,3 @@ void
vzDomainObjEndJob(virDomainObjPtr dom); vzDomainObjEndJob(virDomainObjPtr dom);
int int
vzDomainJobUpdateTime(vzDomainJobObjPtr job); vzDomainJobUpdateTime(vzDomainJobObjPtr job);
#endif /* LIBVIRT_VZ_UTILS_H */