External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

domain_validate.c: make local functions static

Browse Source 
virDomainDefValidateInternal() helpers can now be made static again
since they're all in the same file.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Daniel Henrique Barboza 2020-12-10 21:12:16 -03:00
parent 9432693e2b
commit 80dc61cc3f
2 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conf/domain_validate.c
View File

@ -30,7 +30,7 @@
VIR_LOG_INIT("conf.domain_validate"); VIR_LOG_INIT("conf.domain_validate");
int static int
virDomainDefBootValidate(const virDomainDef *def) virDomainDefBootValidate(const virDomainDef *def)
{ {
if (def->os.bm_timeout_set && def->os.bm_timeout > 65535) { if (def->os.bm_timeout_set && def->os.bm_timeout > 65535) {
@ -52,7 +52,7 @@ virDomainDefBootValidate(const virDomainDef *def)
} }
int static int
virDomainDefVideoValidate(const virDomainDef *def) virDomainDefVideoValidate(const virDomainDef *def)
{ {
size_t i; size_t i;
@ -195,7 +195,7 @@ virDomainDiskAddressDiskBusCompatibility(virDomainDiskBus bus,
} }
int static int
virSecurityDeviceLabelDefValidate(virSecurityDeviceLabelDefPtr *seclabels, virSecurityDeviceLabelDefValidate(virSecurityDeviceLabelDefPtr *seclabels,
size_t nseclabels, size_t nseclabels,
virSecurityLabelDefPtr *vmSeclabels, virSecurityLabelDefPtr *vmSeclabels,
@ -499,7 +499,7 @@ virDomainSmartcardDefValidate(const virDomainSmartcardDef *smartcard,
} }
int static int
virDomainDefTunablesValidate(const virDomainDef *def) virDomainDefTunablesValidate(const virDomainDef *def)
{ {
size_t i, j; size_t i, j;
@ -615,7 +615,7 @@ virDomainControllerDefValidate(const virDomainControllerDef *controller)
} }
int static int
virDomainDefIdMapValidate(const virDomainDef *def) virDomainDefIdMapValidate(const virDomainDef *def)
{ {
if ((def->idmap.uidmap && !def->idmap.gidmap) || if ((def->idmap.uidmap && !def->idmap.gidmap) ||
@ -638,7 +638,7 @@ virDomainDefIdMapValidate(const virDomainDef *def)
} }
int static int
virDomainDefDuplicateDiskInfoValidate(const virDomainDef *def) virDomainDefDuplicateDiskInfoValidate(const virDomainDef *def)
{ {
size_t i; size_t i;
@ -667,7 +667,7 @@ virDomainDefDuplicateDiskInfoValidate(const virDomainDef *def)
* Returns 0 in case of there are no duplicate drive addresses, -1 * Returns 0 in case of there are no duplicate drive addresses, -1
* otherwise. * otherwise.
*/ */
int static int
virDomainDefDuplicateDriveAddressesValidate(const virDomainDef *def) virDomainDefDuplicateDriveAddressesValidate(const virDomainDef *def)
{ {
size_t i; size_t i;
@ -822,7 +822,7 @@ virDomainDeviceDefValidateAliasesIterator(virDomainDefPtr def,
* Returns 0 on success, * Returns 0 on success,
* -1 otherwise (with error reported). * -1 otherwise (with error reported).
*/ */
int static int
virDomainDefValidateAliases(const virDomainDef *def, virDomainDefValidateAliases(const virDomainDef *def,
GHashTable **aliases) GHashTable **aliases)
{ {
@ -901,7 +901,7 @@ virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
} }
int static int
virDomainDefLifecycleActionValidate(const virDomainDef *def) virDomainDefLifecycleActionValidate(const virDomainDef *def)
{ {
if (!virDomainDefLifecycleActionAllowed(VIR_DOMAIN_LIFECYCLE_POWEROFF, if (!virDomainDefLifecycleActionAllowed(VIR_DOMAIN_LIFECYCLE_POWEROFF,
@ -923,7 +923,7 @@ virDomainDefLifecycleActionValidate(const virDomainDef *def)
} }
int static int
virDomainDefMemtuneValidate(const virDomainDef *def) virDomainDefMemtuneValidate(const virDomainDef *def)
{ {
const virDomainMemtune *mem = &(def->mem); const virDomainMemtune *mem = &(def->mem);
@ -975,7 +975,7 @@ virDomainDefMemtuneValidate(const virDomainDef *def)
} }
int static int
virDomainDefOSValidate(const virDomainDef *def, virDomainDefOSValidate(const virDomainDef *def,
virDomainXMLOptionPtr xmlopt) virDomainXMLOptionPtr xmlopt)
{ {
@ -1023,7 +1023,7 @@ virDomainDefOSValidate(const virDomainDef *def,
} \ } \
} while (0) } while (0)
int static int
virDomainDefCputuneValidate(const virDomainDef *def) virDomainDefCputuneValidate(const virDomainDef *def)
{ {
CPUTUNE_VALIDATE_PERIOD(period); CPUTUNE_VALIDATE_PERIOD(period);

17
src/conf/domain_validate.h
View File

@ -25,14 +25,8 @@
#include "domain_conf.h" #include "domain_conf.h"
#include "virconftypes.h" #include "virconftypes.h"
int virDomainDefBootValidate(const virDomainDef *def);
int virDomainDefVideoValidate(const virDomainDef *def);
int virDomainVideoDefValidate(const virDomainVideoDef *video, int virDomainVideoDefValidate(const virDomainVideoDef *video,
const virDomainDef *def); const virDomainDef *def);
int virSecurityDeviceLabelDefValidate(virSecurityDeviceLabelDefPtr *seclabels,
size_t nseclabels,
virSecurityLabelDefPtr *vmSeclabels,
size_t nvmSeclabels);
int virDomainDiskDefValidate(const virDomainDef *def, int virDomainDiskDefValidate(const virDomainDef *def,
const virDomainDiskDef *disk); const virDomainDiskDef *disk);
int virDomainRedirdevDefValidate(const virDomainDef *def, int virDomainRedirdevDefValidate(const virDomainDef *def,
@ -43,21 +37,10 @@ int virDomainRNGDefValidate(const virDomainRNGDef *rng,
const virDomainDef *def); const virDomainDef *def);
int virDomainSmartcardDefValidate(const virDomainSmartcardDef *smartcard, int virDomainSmartcardDefValidate(const virDomainSmartcardDef *smartcard,
const virDomainDef *def); const virDomainDef *def);
int virDomainDefTunablesValidate(const virDomainDef *def);
int virDomainControllerDefValidate(const virDomainControllerDef *controller); int virDomainControllerDefValidate(const virDomainControllerDef *controller);
int virDomainDefIdMapValidate(const virDomainDef *def);
int virDomainDefDuplicateDiskInfoValidate(const virDomainDef *def);
int virDomainDefDuplicateDriveAddressesValidate(const virDomainDef *def);
int virDomainDefValidateAliases(const virDomainDef *def,
GHashTable **aliases);
int virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm, int virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,
unsigned int flags); unsigned int flags);
int virDomainDefLifecycleActionValidate(const virDomainDef *def);
int virDomainDefMemtuneValidate(const virDomainDef *def);
int virDomainDefOSValidate(const virDomainDef *def,
virDomainXMLOptionPtr xmlopt);
int virDomainDefCputuneValidate(const virDomainDef *def);
int virDomainDefValidate(virDomainDefPtr def, int virDomainDefValidate(virDomainDefPtr def,
unsigned int parseFlags, unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,