From c4480eef089b22b6b90c1b695290add3837acb7b Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Tue, 22 Aug 2017 13:29:24 +0200 Subject: [PATCH] conf: rename virDomain*PostParseInternal to virDomain*PostParseCommon These functions contain the post-parse steps common for all drivers. Rename it to use the 'Common' prefix, instead of the vagueness of 'Internal', leaving 'Internal' available for other vague uses. --- src/conf/domain_conf.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 93e5a4525d..07eca23fec 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4367,11 +4367,11 @@ virDomainCheckVirtioOptions(virDomainVirtioOptionsPtr virtio) static int -virDomainDeviceDefPostParseInternal(virDomainDeviceDefPtr dev, - const virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - virDomainXMLOptionPtr xmlopt) +virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev, + const virDomainDef *def, + virCapsPtr caps ATTRIBUTE_UNUSED, + unsigned int parseFlags ATTRIBUTE_UNUSED, + virDomainXMLOptionPtr xmlopt) { if (dev->type == VIR_DOMAIN_DEVICE_CHR) { virDomainChrDefPtr chr = dev->data.chr; @@ -4667,7 +4667,7 @@ virDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, return ret; } - if ((ret = virDomainDeviceDefPostParseInternal(dev, def, caps, flags, xmlopt)) < 0) + if ((ret = virDomainDeviceDefPostParseCommon(dev, def, caps, flags, xmlopt)) < 0) return ret; if (virDomainDeviceDefPostParseCheckFeatures(dev, xmlopt) < 0) @@ -4783,8 +4783,8 @@ virDomainDefPostParseCPU(virDomainDefPtr def) static int -virDomainDefPostParseInternal(virDomainDefPtr def, - struct virDomainDefPostParseDeviceIteratorData *data) +virDomainDefPostParseCommon(virDomainDefPtr def, + struct virDomainDefPostParseDeviceIteratorData *data) { /* verify init path for container based domains */ if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) { @@ -4917,7 +4917,7 @@ virDomainDefPostParse(virDomainDefPtr def, if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0) goto cleanup; - if ((ret = virDomainDefPostParseInternal(def, &data)) < 0) + if ((ret = virDomainDefPostParseCommon(def, &data)) < 0) goto cleanup; if (xmlopt->config.assignAddressesCallback) { -- 2.39.5