External/libvirt
1
0
Fork 0
Code

conf: domain: 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-07 15:20:16 -05:00 committed by Ján Tomko
parent b7356e826c
commit b268e87319
6 changed files with 63 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/conf/domain_addr.h
View File

@ -19,13 +19,12 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_DOMAIN_ADDR_H #pragma once
# define LIBVIRT_DOMAIN_ADDR_H
# include "domain_conf.h" #include "domain_conf.h"
# define VIR_PCI_ADDRESS_SLOT_LAST 31 #define VIR_PCI_ADDRESS_SLOT_LAST 31
# define VIR_PCI_ADDRESS_FUNCTION_LAST 7 #define VIR_PCI_ADDRESS_FUNCTION_LAST 7
typedef enum { typedef enum {
VIR_PCI_ADDRESS_EXTENSION_NONE = 0, /* no extension */ VIR_PCI_ADDRESS_EXTENSION_NONE = 0, /* no extension */
@ -58,7 +57,7 @@ typedef enum {
/* a combination of all bits that describe the type of connections /* a combination of all bits that describe the type of connections
* allowed, e.g. PCI, PCIe, switch * allowed, e.g. PCI, PCIe, switch
*/ */
# define VIR_PCI_CONNECT_TYPES_MASK \ #define VIR_PCI_CONNECT_TYPES_MASK \
(VIR_PCI_CONNECT_TYPE_PCI_DEVICE | VIR_PCI_CONNECT_TYPE_PCIE_DEVICE | \ (VIR_PCI_CONNECT_TYPE_PCI_DEVICE | VIR_PCI_CONNECT_TYPE_PCIE_DEVICE | \
VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT | \ VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT | \
VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_DOWNSTREAM_PORT | \ VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_DOWNSTREAM_PORT | \
@ -74,7 +73,7 @@ typedef enum {
* upstream and downstream switch port, or a PCIe root port and a PCIe * upstream and downstream switch port, or a PCIe root port and a PCIe
* port) * port)
*/ */
# define VIR_PCI_CONNECT_TYPES_ENDPOINT \ #define VIR_PCI_CONNECT_TYPES_ENDPOINT \
(VIR_PCI_CONNECT_TYPE_PCI_DEVICE | VIR_PCI_CONNECT_TYPE_PCIE_DEVICE) (VIR_PCI_CONNECT_TYPE_PCI_DEVICE | VIR_PCI_CONNECT_TYPE_PCIE_DEVICE)
virDomainPCIConnectFlags virDomainPCIConnectFlags
@ -255,7 +254,7 @@ virDomainUSBAddressPortFormatBuf(virBufferPtr buf,
unsigned int *port) unsigned int *port)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
# define VIR_DOMAIN_USB_HUB_PORTS 8 #define VIR_DOMAIN_USB_HUB_PORTS 8
typedef struct _virDomainUSBAddressHub virDomainUSBAddressHub; typedef struct _virDomainUSBAddressHub virDomainUSBAddressHub;
typedef virDomainUSBAddressHub *virDomainUSBAddressHubPtr; typedef virDomainUSBAddressHub *virDomainUSBAddressHubPtr;
@ -312,4 +311,3 @@ int
virDomainUSBAddressRelease(virDomainUSBAddressSetPtr addrs, virDomainUSBAddressRelease(virDomainUSBAddressSetPtr addrs,
virDomainDeviceInfoPtr info) virDomainDeviceInfoPtr info)
ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(2);
#endif /* LIBVIRT_DOMAIN_ADDR_H */

10
src/conf/domain_audit.h
View File

@ -19,11 +19,10 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_DOMAIN_AUDIT_H #pragma once
# define LIBVIRT_DOMAIN_AUDIT_H
# include "domain_conf.h" #include "domain_conf.h"
# include "vircgroup.h" #include "vircgroup.h"
void virDomainAuditStart(virDomainObjPtr vm, void virDomainAuditStart(virDomainObjPtr vm,
const char *reason, const char *reason,
@ -136,6 +135,3 @@ void virDomainAuditInput(virDomainObjPtr vm,
const char *reason, const char *reason,
bool success) bool success)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
#endif /* LIBVIRT_DOMAIN_AUDIT_H */

15
src/conf/domain_capabilities.h
View File

@ -18,13 +18,12 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_DOMAIN_CAPABILITIES_H #pragma once
# define LIBVIRT_DOMAIN_CAPABILITIES_H
# include "internal.h" #include "internal.h"
# include "domain_conf.h" #include "domain_conf.h"
# include "virautoclean.h" #include "virautoclean.h"
# include "virenum.h" #include "virenum.h"
typedef const char * (*virDomainCapsValToStr)(int value); typedef const char * (*virDomainCapsValToStr)(int value);
@ -201,7 +200,7 @@ virDomainCapsCPUModelsGet(virDomainCapsCPUModelsPtr cpuModels,
const char *name); const char *name);
# define VIR_DOMAIN_CAPS_ENUM_SET(capsEnum, ...) \ #define VIR_DOMAIN_CAPS_ENUM_SET(capsEnum, ...) \
do { \ do { \
unsigned int __values[] = {__VA_ARGS__}; \ unsigned int __values[] = {__VA_ARGS__}; \
size_t __nvalues = ARRAY_CARDINALITY(__values); \ size_t __nvalues = ARRAY_CARDINALITY(__values); \
@ -221,5 +220,3 @@ void
virSEVCapabilitiesFree(virSEVCapability *capabilities); virSEVCapabilitiesFree(virSEVCapability *capabilities);
VIR_DEFINE_AUTOPTR_FUNC(virSEVCapability, virSEVCapabilitiesFree); VIR_DEFINE_AUTOPTR_FUNC(virSEVCapability, virSEVCapabilitiesFree);
#endif /* LIBVIRT_DOMAIN_CAPABILITIES_H */

87
src/conf/domain_conf.h
View File

@ -20,43 +20,42 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_DOMAIN_CONF_H #pragma once
# define LIBVIRT_DOMAIN_CONF_H
# include <libxml/parser.h> #include <libxml/parser.h>
# include <libxml/tree.h> #include <libxml/tree.h>
# include <libxml/xpath.h> #include <libxml/xpath.h>
# include "internal.h" #include "internal.h"
# include "virconftypes.h" #include "virconftypes.h"
# include "capabilities.h" #include "capabilities.h"
# include "virstorageencryption.h" #include "virstorageencryption.h"
# include "cpu_conf.h" #include "cpu_conf.h"
# include "virthread.h" #include "virthread.h"
# include "virhash.h" #include "virhash.h"
# include "virsocketaddr.h" #include "virsocketaddr.h"
# include "networkcommon_conf.h" #include "networkcommon_conf.h"
# include "nwfilter_params.h" #include "nwfilter_params.h"
# include "numa_conf.h" #include "numa_conf.h"
# include "virnetdevmacvlan.h" #include "virnetdevmacvlan.h"
# include "virsysinfo.h" #include "virsysinfo.h"
# include "virnetdev.h" #include "virnetdev.h"
# include "virnetdevip.h" #include "virnetdevip.h"
# include "virnetdevvportprofile.h" #include "virnetdevvportprofile.h"
# include "virnetdevbandwidth.h" #include "virnetdevbandwidth.h"
# include "virnetdevvlan.h" #include "virnetdevvlan.h"
# include "virobject.h" #include "virobject.h"
# include "device_conf.h" #include "device_conf.h"
# include "virbitmap.h" #include "virbitmap.h"
# include "virstoragefile.h" #include "virstoragefile.h"
# include "virseclabel.h" #include "virseclabel.h"
# include "virprocess.h" #include "virprocess.h"
# include "virgic.h" #include "virgic.h"
# include "virperf.h" #include "virperf.h"
# include "virtypedparam.h" #include "virtypedparam.h"
# include "virsavecookie.h" #include "virsavecookie.h"
# include "virresctrl.h" #include "virresctrl.h"
# include "virenum.h" #include "virenum.h"
/* Flags for the 'type' field in virDomainDeviceDef */ /* Flags for the 'type' field in virDomainDeviceDef */
typedef enum { typedef enum {
@ -680,7 +679,7 @@ typedef enum {
VIR_DOMAIN_CONTROLLER_MODEL_VIRTIO_SERIAL_LAST VIR_DOMAIN_CONTROLLER_MODEL_VIRTIO_SERIAL_LAST
} virDomainControllerModelVirtioSerial; } virDomainControllerModelVirtioSerial;
# define IS_USB2_CONTROLLER(ctrl) \ #define IS_USB2_CONTROLLER(ctrl) \
(((ctrl)->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) && \ (((ctrl)->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) && \
((ctrl)->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1 || \ ((ctrl)->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1 || \
(ctrl)->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI1 || \ (ctrl)->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI1 || \
@ -1208,8 +1207,8 @@ typedef enum {
VIR_DOMAIN_SMARTCARD_TYPE_LAST VIR_DOMAIN_SMARTCARD_TYPE_LAST
} virDomainSmartcardType; } virDomainSmartcardType;
# define VIR_DOMAIN_SMARTCARD_NUM_CERTIFICATES 3 #define VIR_DOMAIN_SMARTCARD_NUM_CERTIFICATES 3
# define VIR_DOMAIN_SMARTCARD_DEFAULT_DATABASE "/etc/pki/nssdb" #define VIR_DOMAIN_SMARTCARD_DEFAULT_DATABASE "/etc/pki/nssdb"
struct _virDomainSmartcardDef { struct _virDomainSmartcardDef {
int type; /* virDomainSmartcardType */ int type; /* virDomainSmartcardType */
@ -1252,7 +1251,7 @@ typedef enum {
VIR_DOMAIN_TPM_VERSION_LAST VIR_DOMAIN_TPM_VERSION_LAST
} virDomainTPMVersion; } virDomainTPMVersion;
# define VIR_DOMAIN_TPM_DEFAULT_DEVICE "/dev/tpm0" #define VIR_DOMAIN_TPM_DEFAULT_DEVICE "/dev/tpm0"
struct _virDomainTPMDef { struct _virDomainTPMDef {
int type; /* virDomainTPMBackendType */ int type; /* virDomainTPMBackendType */
@ -1701,7 +1700,7 @@ typedef enum {
} virDomainSmbiosMode; } virDomainSmbiosMode;
# define VIR_DOMAIN_MAX_BOOT_DEVS 4 #define VIR_DOMAIN_MAX_BOOT_DEVS 4
typedef enum { typedef enum {
VIR_DOMAIN_BOOT_FLOPPY, VIR_DOMAIN_BOOT_FLOPPY,
@ -1737,7 +1736,7 @@ typedef enum {
VIR_DOMAIN_FEATURE_LAST VIR_DOMAIN_FEATURE_LAST
} virDomainFeature; } virDomainFeature;
# define VIR_DOMAIN_HYPERV_VENDOR_ID_MAX 12 #define VIR_DOMAIN_HYPERV_VENDOR_ID_MAX 12
typedef enum { typedef enum {
VIR_DOMAIN_HYPERV_RELAXED = 0, VIR_DOMAIN_HYPERV_RELAXED = 0,
@ -2167,7 +2166,7 @@ struct _virDomainHugePage {
unsigned long long size; /* hugepage size in KiB */ unsigned long long size; /* hugepage size in KiB */
}; };
# define VIR_DOMAIN_CPUMASK_LEN 1024 #define VIR_DOMAIN_CPUMASK_LEN 1024
struct _virDomainIOThreadIDDef { struct _virDomainIOThreadIDDef {
bool autofill; bool autofill;
@ -3042,7 +3041,7 @@ void virDomainIOThreadIDDel(virDomainDefPtr def, unsigned int iothread_id);
* server omits the requested output, but a new flag to suppress * server omits the requested output, but a new flag to suppress
* information could result in a security hole when older libvirt * information could result in a security hole when older libvirt
* supplies the sensitive information in spite of the flag. */ * supplies the sensitive information in spite of the flag. */
# define VIR_DOMAIN_XML_COMMON_FLAGS \ #define VIR_DOMAIN_XML_COMMON_FLAGS \
(VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_INACTIVE | \ (VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_INACTIVE | \
VIR_DOMAIN_XML_MIGRATABLE) VIR_DOMAIN_XML_MIGRATABLE)
unsigned int virDomainDefFormatConvertXMLFlags(unsigned int flags); unsigned int virDomainDefFormatConvertXMLFlags(unsigned int flags);
@ -3637,5 +3636,3 @@ virDomainGraphicsGetRenderNode(const virDomainGraphicsDef *graphics);
bool bool
virDomainGraphicsNeedsAutoRenderNode(const virDomainGraphicsDef *graphics); virDomainGraphicsNeedsAutoRenderNode(const virDomainGraphicsDef *graphics);
#endif /* LIBVIRT_DOMAIN_CONF_H */

11
src/conf/domain_event.h
View File

@ -20,12 +20,11 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_DOMAIN_EVENT_H #pragma once
# define LIBVIRT_DOMAIN_EVENT_H
# include "internal.h" #include "internal.h"
# include "object_event.h" #include "object_event.h"
# include "domain_conf.h" #include "domain_conf.h"
virObjectEventPtr virObjectEventPtr
@ -323,5 +322,3 @@ virDomainQemuMonitorEventNew(int id,
unsigned int micros, unsigned int micros,
const char *details) const char *details)
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
#endif /* LIBVIRT_DOMAIN_EVENT_H */

5
src/conf/domain_nwfilter.h
View File

@ -19,8 +19,7 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_DOMAIN_NWFILTER_H #pragma once
# define LIBVIRT_DOMAIN_NWFILTER_H
int virDomainConfNWFilterInstantiate(const char *vmname, int virDomainConfNWFilterInstantiate(const char *vmname,
const unsigned char *vmuuid, const unsigned char *vmuuid,
@ -28,5 +27,3 @@ int virDomainConfNWFilterInstantiate(const char *vmname,
bool ignoreExists); bool ignoreExists);
void virDomainConfNWFilterTeardown(virDomainNetDefPtr net); void virDomainConfNWFilterTeardown(virDomainNetDefPtr net);
void virDomainConfVMNWFilterTeardown(virDomainObjPtr vm); void virDomainConfVMNWFilterTeardown(virDomainObjPtr vm);
#endif /* LIBVIRT_DOMAIN_NWFILTER_H */