On Thu, Jan 07, 2016 at 22:50:02 -0500, Cole Robinson wrote:
We will use this in upcoming patches --- src/conf/domain_conf.c | 31 +++++++++++++++++++++---------- src/conf/domain_conf.h | 4 ++++ src/libvirt_private.syms | 1 + 3 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 61dc650..52dd293 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4187,12 +4187,10 @@ virDomainDefPostParseDeviceIterator(virDomainDefPtr def ATTRIBUTE_UNUSED, return virDomainDeviceDefPostParse(dev, data->def, data->caps, data->xmlopt); }
-
White space damage.
int -virDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps, - unsigned int parseFlags, - virDomainXMLOptionPtr xmlopt) +virDomainDefPostParseDevices(virDomainDefPtr def, + virCapsPtr caps, + virDomainXMLOptionPtr xmlopt) { int ret; struct virDomainDefPostParseDeviceIteratorData data = { @@ -4201,6 +4199,23 @@ virDomainDefPostParse(virDomainDefPtr def, .xmlopt = xmlopt, };
+ if ((ret = virDomainDeviceInfoIterateInternal(def, + virDomainDefPostParseDeviceIterator, + true, + &data)) < 0) + return ret; + + return 0; +} +
Standard are two newlines.
+int +virDomainDefPostParse(virDomainDefPtr def, + virCapsPtr caps, + unsigned int parseFlags, + virDomainXMLOptionPtr xmlopt) +{ + int ret; + /* call the domain config callback */ if (xmlopt->config.domainPostParseCallback) { ret = xmlopt->config.domainPostParseCallback(def, caps,
ACK