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

conf: remove 'bootHash' from the post-parse infrastructure

Browse Source 
As the function signature of virDomainDefPostParseInternal does not
differ from virDomainDefPostParse now, the wrapper can be dropped.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-05-28 11:36:44 +02:00 committed by Ján Tomko
parent 5b75a4a80d
commit a17b088218
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/conf/domain_conf.c
View File

@ -5007,8 +5007,7 @@ virDomainDefBootOrderPostParse(virDomainDefPtr def)
static int static int
virDomainDefPostParseCommon(virDomainDefPtr def, virDomainDefPostParseCommon(virDomainDefPtr def,
struct virDomainDefPostParseDeviceIteratorData *data, struct virDomainDefPostParseDeviceIteratorData *data)
virHashTablePtr bootHash ATTRIBUTE_UNUSED)
{ {
size_t i; size_t i;
@ -5116,13 +5115,12 @@ virDomainDefPostParseCheckFailure(virDomainDefPtr def,
} }
static int int
virDomainDefPostParseInternal(virDomainDefPtr def, virDomainDefPostParse(virDomainDefPtr def,
virCapsPtr caps, virCapsPtr caps,
unsigned int parseFlags, unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque, void *parseOpaque)
virHashTablePtr bootHash)
{ {
int ret = -1; int ret = -1;
bool localParseOpaque = false; bool localParseOpaque = false;
@ -5178,7 +5176,7 @@ virDomainDefPostParseInternal(virDomainDefPtr def,
if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0) if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)
goto cleanup; goto cleanup;
if ((ret = virDomainDefPostParseCommon(def, &data, bootHash)) < 0) if ((ret = virDomainDefPostParseCommon(def, &data)) < 0)
goto cleanup; goto cleanup;
if (xmlopt->config.assignAddressesCallback) { if (xmlopt->config.assignAddressesCallback) {
@ -5205,18 +5203,6 @@ virDomainDefPostParseInternal(virDomainDefPtr def,
} }
int
virDomainDefPostParse(virDomainDefPtr def,
virCapsPtr caps,
unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt,
void *parseOpaque)
{
return virDomainDefPostParseInternal(def, caps, parseFlags, xmlopt,
parseOpaque, NULL);
}
/** /**
* virDomainDiskAddressDiskBusCompatibility: * virDomainDiskAddressDiskBusCompatibility:
* @bus: disk bus type * @bus: disk bus type
@ -20560,8 +20546,7 @@ virDomainDefParseXML(xmlDocPtr xml,
goto error; goto error;
/* callback to fill driver specific domain aspects */ /* callback to fill driver specific domain aspects */
if (virDomainDefPostParseInternal(def, caps, flags, xmlopt, parseOpaque, if (virDomainDefPostParse(def, caps, flags, xmlopt, parseOpaque) < 0)
bootHash) < 0)
goto error; goto error;
/* valdiate configuration */ /* valdiate configuration */