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 virDomainDeviceDefValidateInternal() helpers static

Browse Source 
After the move from the previous patch, these functions are now all
used in domain_validate.c and doesn't need to be public.

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-11 09:37:46 -03:00
parent 4e20ee3ace
commit c54673f793
2 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/conf/domain_validate.c
View File

@ -76,7 +76,7 @@ virDomainDefVideoValidate(const virDomainDef *def)
} }
int static int
virDomainVideoDefValidate(const virDomainVideoDef *video, virDomainVideoDefValidate(const virDomainVideoDef *video,
const virDomainDef *def) const virDomainDef *def)
{ {
@ -229,7 +229,7 @@ virSecurityDeviceLabelDefValidate(virSecurityDeviceLabelDefPtr *seclabels,
#define VENDOR_LEN 8 #define VENDOR_LEN 8
#define PRODUCT_LEN 16 #define PRODUCT_LEN 16
int static int
virDomainDiskDefValidate(const virDomainDef *def, virDomainDiskDefValidate(const virDomainDef *def,
const virDomainDiskDef *disk) const virDomainDiskDef *disk)
{ {
@ -446,7 +446,7 @@ virDomainChrSourceDefValidate(const virDomainChrSourceDef *src_def,
} }
int static int
virDomainRedirdevDefValidate(const virDomainDef *def, virDomainRedirdevDefValidate(const virDomainDef *def,
const virDomainRedirdevDef *redirdev) const virDomainRedirdevDef *redirdev)
{ {
@ -462,7 +462,7 @@ virDomainRedirdevDefValidate(const virDomainDef *def,
} }
int static int
virDomainChrDefValidate(const virDomainChrDef *chr, virDomainChrDefValidate(const virDomainChrDef *chr,
const virDomainDef *def) const virDomainDef *def)
{ {
@ -470,7 +470,7 @@ virDomainChrDefValidate(const virDomainChrDef *chr,
} }
int static int
virDomainRNGDefValidate(const virDomainRNGDef *rng, virDomainRNGDefValidate(const virDomainRNGDef *rng,
const virDomainDef *def) const virDomainDef *def)
{ {
@ -481,7 +481,7 @@ virDomainRNGDefValidate(const virDomainRNGDef *rng,
} }
int static int
virDomainSmartcardDefValidate(const virDomainSmartcardDef *smartcard, virDomainSmartcardDefValidate(const virDomainSmartcardDef *smartcard,
const virDomainDef *def) const virDomainDef *def)
{ {
@ -520,7 +520,7 @@ virDomainDefTunablesValidate(const virDomainDef *def)
} }
int static int
virDomainControllerDefValidate(const virDomainControllerDef *controller) virDomainControllerDefValidate(const virDomainControllerDef *controller)
{ {
if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) { if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) {
@ -1273,7 +1273,7 @@ virDomainActualNetDefValidate(const virDomainNetDef *net)
} }
int static int
virDomainNetDefValidate(const virDomainNetDef *net) virDomainNetDefValidate(const virDomainNetDef *net)
{ {
char macstr[VIR_MAC_STRING_BUFLEN]; char macstr[VIR_MAC_STRING_BUFLEN];
@ -1323,7 +1323,7 @@ virDomainNetDefValidate(const virDomainNetDef *net)
} }
int static int
virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev) virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
{ {
if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) { if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
@ -1374,7 +1374,7 @@ virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
} }
int static int
virDomainMemoryDefValidate(const virDomainMemoryDef *mem, virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
const virDomainDef *def) const virDomainDef *def)
{ {
@ -1402,7 +1402,7 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
} }
int static int
virDomainVsockDefValidate(const virDomainVsockDef *vsock) virDomainVsockDefValidate(const virDomainVsockDef *vsock)
{ {
if (vsock->guest_cid > 0 && vsock->guest_cid <= 2) { if (vsock->guest_cid > 0 && vsock->guest_cid <= 2) {
@ -1414,7 +1414,8 @@ virDomainVsockDefValidate(const virDomainVsockDef *vsock)
return 0; return 0;
} }
int
static int
virDomainInputDefValidate(const virDomainInputDef *input) virDomainInputDefValidate(const virDomainInputDef *input)
{ {
switch ((virDomainInputType) input->type) { switch ((virDomainInputType) input->type) {
@ -1448,7 +1449,7 @@ virDomainInputDefValidate(const virDomainInputDef *input)
} }
int static int
virDomainShmemDefValidate(const virDomainShmemDef *shmem) virDomainShmemDefValidate(const virDomainShmemDef *shmem)
{ {
if (strchr(shmem->name, '/')) { if (strchr(shmem->name, '/')) {

20
src/conf/domain_validate.h
View File

@ -25,19 +25,6 @@
#include "domain_conf.h" #include "domain_conf.h"
#include "virconftypes.h" #include "virconftypes.h"
int virDomainVideoDefValidate(const virDomainVideoDef *video,
const virDomainDef *def);
int virDomainDiskDefValidate(const virDomainDef *def,
const virDomainDiskDef *disk);
int virDomainRedirdevDefValidate(const virDomainDef *def,
const virDomainRedirdevDef *redirdev);
int virDomainChrDefValidate(const virDomainChrDef *chr,
const virDomainDef *def);
int virDomainRNGDefValidate(const virDomainRNGDef *rng,
const virDomainDef *def);
int virDomainSmartcardDefValidate(const virDomainSmartcardDef *smartcard,
const virDomainDef *def);
int virDomainControllerDefValidate(const virDomainControllerDef *controller);
int virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm, int virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,
unsigned int flags); unsigned int flags);
@ -46,13 +33,6 @@ int virDomainDefValidate(virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque); void *parseOpaque);
int virDomainActualNetDefValidate(const virDomainNetDef *net); int virDomainActualNetDefValidate(const virDomainNetDef *net);
int virDomainNetDefValidate(const virDomainNetDef *net);
int virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev);
int virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
const virDomainDef *def);
int virDomainVsockDefValidate(const virDomainVsockDef *vsock);
int virDomainInputDefValidate(const virDomainInputDef *input);
int virDomainShmemDefValidate(const virDomainShmemDef *shmem);
int virDomainDeviceDefValidate(const virDomainDeviceDef *dev, int virDomainDeviceDefValidate(const virDomainDeviceDef *dev,
const virDomainDef *def, const virDomainDef *def,
unsigned int parseFlags, unsigned int parseFlags,