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

domain_conf: Unexport virDomainDefPostParseDeviceIteratorData

Browse Source 
The virDomainDefPostParseDeviceIteratorData struct is exported in
domain_conf.h because it's used in both domain_conf.c and
domain_validate.c. However, the latter usage is not warranted,
it's just a shortcut so that we don't have to introduce a similar
struct just for domain_validate.c. Well, do the extra step and
introduce a separate structure for domain_validate.c. This allows
us to move post parse code later on.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2022-07-07 10:09:27 +02:00
parent 89c16bf9dd
commit 531b62950f
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf/domain_conf.c
View File

@ -6031,6 +6031,13 @@ virDomainDeviceDefPostParseOne(virDomainDeviceDef *dev,
} }
struct virDomainDefPostParseDeviceIteratorData {
virDomainXMLOption *xmlopt;
void *parseOpaque;
unsigned int parseFlags;
};
static int static int
virDomainDefPostParseDeviceIterator(virDomainDef *def, virDomainDefPostParseDeviceIterator(virDomainDef *def,
virDomainDeviceDef *dev, virDomainDeviceDef *dev,

6
src/conf/domain_conf.h
View File

@ -3302,12 +3302,6 @@ struct _virDomainXMLOption {
}; };
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainXMLOption, virObjectUnref); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainXMLOption, virObjectUnref);
struct virDomainDefPostParseDeviceIteratorData {
virDomainXMLOption *xmlopt;
void *parseOpaque;
unsigned int parseFlags;
};
bool bool
virDomainSCSIDriveAddressIsUsed(const virDomainDef *def, virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
const virDomainDeviceDriveAddress *addr); const virDomainDeviceDriveAddress *addr);

11
src/conf/domain_validate.c
View File

@ -1889,13 +1889,20 @@ virDomainDefValidateInternal(const virDomainDef *def,
} }
struct virDomainDefValidateDeviceIteratorData {
virDomainXMLOption *xmlopt;
void *parseOpaque;
unsigned int parseFlags;
};
static int static int
virDomainDefValidateDeviceIterator(virDomainDef *def, virDomainDefValidateDeviceIterator(virDomainDef *def,
virDomainDeviceDef *dev, virDomainDeviceDef *dev,
virDomainDeviceInfo *info G_GNUC_UNUSED, virDomainDeviceInfo *info G_GNUC_UNUSED,
void *opaque) void *opaque)
{ {
struct virDomainDefPostParseDeviceIteratorData *data = opaque; struct virDomainDefValidateDeviceIteratorData *data = opaque;
return virDomainDeviceDefValidate(dev, def, return virDomainDeviceDefValidate(dev, def,
data->parseFlags, data->xmlopt, data->parseFlags, data->xmlopt,
data->parseOpaque); data->parseOpaque);
@ -1924,7 +1931,7 @@ virDomainDefValidate(virDomainDef *def,
virDomainXMLOption *xmlopt, virDomainXMLOption *xmlopt,
void *parseOpaque) void *parseOpaque)
{ {
struct virDomainDefPostParseDeviceIteratorData data = { struct virDomainDefValidateDeviceIteratorData data = {
.xmlopt = xmlopt, .xmlopt = xmlopt,
.parseFlags = parseFlags, .parseFlags = parseFlags,
.parseOpaque = parseOpaque, .parseOpaque = parseOpaque,