separate virDomainDefParseVirtTypeInfo from virDomainDefParseXML --- src/conf/domain_conf.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 055404e..bf2cf7f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18565,6 +18565,36 @@ virDomainDefParseIdInfo(virDomainParseTotalParamPtr param) } +static int +virDomainDefParseVirtTypeInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + char *tmp = NULL; + int virtType; + int ret = -1; + + /* Find out what type of virtualization to use */ + if (!(tmp = virXMLPropString(ctxt->node, "type"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("missing domain type attribute")); + goto cleanup; + } + + if ((virtType = virDomainVirtTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid domain type %s"), tmp); + goto cleanup; + } + def->virtType = virtType; + ret = 0; + + cleanup: + VIR_FREE(tmp); + return ret; +} + + static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr root, @@ -18579,7 +18609,7 @@ virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr *nodes = NULL, node = NULL; char *tmp = NULL; size_t i, j; - int n, virtType, gic_version; + int n, gic_version; size_t fun_index = 0; virDomainDefPtr def; bool uuid_generated = false; @@ -18606,6 +18636,7 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainPreaseInfoFunc parse_funs[] = { virDomainDefParseIdInfo, + virDomainDefParseVirtTypeInfo, NULL }; @@ -18633,21 +18664,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* Find out what type of virtualization to use */ - if (!(tmp = virXMLPropString(ctxt->node, "type"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("missing domain type attribute")); - goto error; - } - - if ((virtType = virDomainVirtTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid domain type %s"), tmp); - goto error; - } - def->virtType = virtType; - VIR_FREE(tmp); - def->os.bootloader = virXPathString("string(./bootloader)", ctxt); def->os.bootloaderArgs = virXPathString("string(./bootloader_args)", ctxt); -- 2.8.3

separate virDomainDefParseDomainInfo from virDomainDefParseXML --- src/conf/domain_conf.c | 90 +++++++++++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 37 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0f7069c..2daa6df 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18694,6 +18694,58 @@ virDomainDefParseOsNodeInfo(virDomainParseTotalParamPtr param) } +static int +virDomainDefParseDomainInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + char *tmp = NULL; + int ret = -1; + + /* Extract domain name */ + if (!(def->name = virXPathString("string(./name[1])", ctxt))) { + virReportError(VIR_ERR_NO_NAME, NULL); + goto cleanup; + } + + /* Extract domain uuid. If both uuid and sysinfo/system/entry/uuid + * exist, they must match; and if only the latter exists, it can + * also serve as the uuid. */ + tmp = virXPathString("string(./uuid[1])", ctxt); + if (!tmp) { + if (virUUIDGenerate(def->uuid)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Failed to generate UUID")); + goto cleanup; + } + param->uuid_generated = true; + } else { + if (virUUIDParse(tmp, def->uuid) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("malformed uuid element")); + goto cleanup; + } + VIR_FREE(tmp); + } + + /* Extract short description of domain (title) */ + def->title = virXPathString("string(./title[1])", ctxt); + if (def->title && strchr(def->title, '\n')) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Domain title can't contain newlines")); + goto cleanup; + } + + /* Extract documentation if present */ + def->description = virXPathString("string(./description[1])", ctxt); + ret = 0; + + cleanup: + VIR_FREE(tmp); + return ret; +} + + static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr root, @@ -18737,6 +18789,7 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainDefParseIdInfo, virDomainDefParseVirtTypeInfo, virDomainDefParseOsNodeInfo, + virDomainDefParseDomainInfo, NULL }; @@ -18764,43 +18817,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* Extract domain name */ - if (!(def->name = virXPathString("string(./name[1])", ctxt))) { - virReportError(VIR_ERR_NO_NAME, NULL); - goto error; - } - - /* Extract domain uuid. If both uuid and sysinfo/system/entry/uuid - * exist, they must match; and if only the latter exists, it can - * also serve as the uuid. */ - tmp = virXPathString("string(./uuid[1])", ctxt); - if (!tmp) { - if (virUUIDGenerate(def->uuid)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Failed to generate UUID")); - goto error; - } - uuid_generated = true; - } else { - if (virUUIDParse(tmp, def->uuid) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("malformed uuid element")); - goto error; - } - VIR_FREE(tmp); - } - - /* Extract short description of domain (title) */ - def->title = virXPathString("string(./title[1])", ctxt); - if (def->title && strchr(def->title, '\n')) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Domain title can't contain newlines")); - goto error; - } - - /* Extract documentation if present */ - def->description = virXPathString("string(./description[1])", ctxt); - /* analysis of security label, done early even though we format it * late, so devices can refer to this for defaults */ if (!(flags & VIR_DOMAIN_DEF_PARSE_SKIP_SECLABEL)) { -- 2.8.3

separate virDomainDefParseMemoryInfo from virDomainDefParseXML --- src/conf/domain_conf.c | 228 +++++++++++++++++++++++++++---------------------- 1 file changed, 125 insertions(+), 103 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 64b6c09..809c06a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18764,96 +18764,34 @@ virDomainDefParseSecurityLabelInfo(virDomainParseTotalParamPtr param) } - -static virDomainDefPtr -virDomainDefParseXML(xmlDocPtr xml, - xmlNodePtr root, - xmlXPathContextPtr ctxt, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt, - void *parseOpaque, - unsigned int flags) +static int +virDomainDefParseMemoryInfo(virDomainParseTotalParamPtr param) { - typedef int (*virDomainPreaseInfoFunc)(virDomainParseTotalParamPtr params); - - xmlNodePtr *nodes = NULL, node = NULL; - char *tmp = NULL; + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + int ret = -1; + int n; size_t i, j; - int n, gic_version; - size_t fun_index = 0; - virDomainDefPtr def; - bool uuid_generated = false; - virHashTablePtr bootHash = NULL; - bool usb_none = false; - bool usb_other = false; - bool usb_master = false; - char *netprefix = NULL; - virDomainParseTotalParam param = { - NULL, - xml, - root, - ctxt, - caps, - xmlopt, - parseOpaque, - flags, - false, - false, - false, - false - - }; - - virDomainPreaseInfoFunc parse_funs[] = { - virDomainDefParseIdInfo, - virDomainDefParseVirtTypeInfo, - virDomainDefParseOsNodeInfo, - virDomainDefParseDomainInfo, - virDomainDefParseSecurityLabelInfo, - NULL - }; - - if (flags & VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA) { - char *schema = virFileFindResource("domain.rng", - abs_topsrcdir "/docs/schemas", - PKGDATADIR "/schemas"); - if (!schema) - return NULL; - if (virXMLValidateAgainstSchema(schema, xml) < 0) { - VIR_FREE(schema); - return NULL; - } - VIR_FREE(schema); - } - - if (!(def = virDomainDefNew())) - return NULL; - - param.def = def; - - while (parse_funs[fun_index]) { - if (parse_funs[fun_index](¶m) < 0) - goto error; - fun_index++; - } + char *tmp = NULL; + xmlNodePtr *nodes = NULL, node = NULL; /* Extract domain memory */ if (virDomainParseMemory("./memory[1]", NULL, ctxt, &def->mem.total_memory, false, true) < 0) - goto error; + goto cleanup; if (virDomainParseMemory("./currentMemory[1]", NULL, ctxt, &def->mem.cur_balloon, false, true) < 0) - goto error; + goto cleanup; if (virDomainParseMemory("./maxMemory[1]", NULL, ctxt, &def->mem.max_memory, false, false) < 0) - goto error; + goto cleanup; if (virXPathUInt("string(./maxMemory[1]/@slots)", ctxt, &def->mem.memory_slots) == -2) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Failed to parse memory slot count")); - goto error; + goto cleanup; } /* and info about it */ @@ -18861,7 +18799,7 @@ virDomainDefParseXML(xmlDocPtr xml, (def->mem.dump_core = virTristateSwitchTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid memory core dump attribute value '%s'"), tmp); - goto error; + goto cleanup; } VIR_FREE(tmp); @@ -18870,7 +18808,7 @@ virDomainDefParseXML(xmlDocPtr xml, if ((def->mem.source = virDomainMemorySourceTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown memoryBacking/source/type '%s'"), tmp); - goto error; + goto cleanup; } VIR_FREE(tmp); } @@ -18880,7 +18818,7 @@ virDomainDefParseXML(xmlDocPtr xml, if ((def->mem.access = virDomainMemoryAccessTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown memoryBacking/access/mode '%s'"), tmp); - goto error; + goto cleanup; } VIR_FREE(tmp); } @@ -18890,7 +18828,7 @@ virDomainDefParseXML(xmlDocPtr xml, if ((def->mem.allocation = virDomainMemoryAllocationTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown memoryBacking/allocation/mode '%s'"), tmp); - goto error; + goto cleanup; } VIR_FREE(tmp); } @@ -18901,29 +18839,29 @@ virDomainDefParseXML(xmlDocPtr xml, if (def->mem.allocation == VIR_DOMAIN_MEMORY_ALLOCATION_ONDEMAND) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("hugepages are not allowed with memory allocation ondemand")); - goto error; + goto cleanup; } if (def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_ANONYMOUS) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("hugepages are not allowed with anonymous memory source")); - goto error; + goto cleanup; } if ((n = virXPathNodeSet("./memoryBacking/hugepages/page", ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot extract hugepages nodes")); - goto error; + goto cleanup; } if (n) { if (VIR_ALLOC_N(def->mem.hugepages, n) < 0) - goto error; + goto cleanup; for (i = 0; i < n; i++) { if (virDomainHugepagesParseXML(nodes[i], ctxt, &def->mem.hugepages[i]) < 0) - goto error; + goto cleanup; def->mem.nhugepages++; for (j = 0; j < i; j++) { @@ -18936,7 +18874,7 @@ virDomainDefParseXML(xmlDocPtr xml, "of sizes %llu and %llu intersect"), def->mem.hugepages[i].size, def->mem.hugepages[j].size); - goto error; + goto cleanup; } else if (!def->mem.hugepages[i].nodemask && !def->mem.hugepages[j].nodemask) { virReportError(VIR_ERR_XML_DETAIL, @@ -18944,7 +18882,7 @@ virDomainDefParseXML(xmlDocPtr xml, "%llu and %llu"), def->mem.hugepages[i].size, def->mem.hugepages[j].size); - goto error; + goto cleanup; } } } @@ -18953,7 +18891,7 @@ virDomainDefParseXML(xmlDocPtr xml, } else { /* no hugepage pages */ if (VIR_ALLOC(def->mem.hugepages) < 0) - goto error; + goto cleanup; def->mem.nhugepages = 1; } @@ -18965,6 +18903,107 @@ virDomainDefParseXML(xmlDocPtr xml, if (virXPathBoolean("boolean(./memoryBacking/locked)", ctxt)) def->mem.locked = true; + /* Extract other memory tunables */ + if (virDomainParseMemoryLimit("./memtune/hard_limit[1]", NULL, ctxt, + &def->mem.hard_limit) < 0) + goto cleanup; + + if (virDomainParseMemoryLimit("./memtune/soft_limit[1]", NULL, ctxt, + &def->mem.soft_limit) < 0) + goto cleanup; + + if (virDomainParseMemory("./memtune/min_guarantee[1]", NULL, ctxt, + &def->mem.min_guarantee, false, false) < 0) + goto cleanup; + + if (virDomainParseMemoryLimit("./memtune/swap_hard_limit[1]", NULL, ctxt, + &def->mem.swap_hard_limit) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(nodes); + VIR_FREE(tmp); + return ret; + +} + + +static virDomainDefPtr +virDomainDefParseXML(xmlDocPtr xml, + xmlNodePtr root, + xmlXPathContextPtr ctxt, + virCapsPtr caps, + virDomainXMLOptionPtr xmlopt, + void *parseOpaque, + unsigned int flags) +{ + typedef int (*virDomainPreaseInfoFunc)(virDomainParseTotalParamPtr params); + + xmlNodePtr *nodes = NULL, node = NULL; + char *tmp = NULL; + size_t i, j; + int n, gic_version; + size_t fun_index = 0; + virDomainDefPtr def; + bool uuid_generated = false; + virHashTablePtr bootHash = NULL; + bool usb_none = false; + bool usb_other = false; + bool usb_master = false; + char *netprefix = NULL; + virDomainParseTotalParam param = { + NULL, + xml, + root, + ctxt, + caps, + xmlopt, + parseOpaque, + flags, + false, + false, + false, + false + + }; + + virDomainPreaseInfoFunc parse_funs[] = { + virDomainDefParseIdInfo, + virDomainDefParseVirtTypeInfo, + virDomainDefParseOsNodeInfo, + virDomainDefParseDomainInfo, + virDomainDefParseSecurityLabelInfo, + virDomainDefParseMemoryInfo, + NULL + }; + + if (flags & VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA) { + char *schema = virFileFindResource("domain.rng", + abs_topsrcdir "/docs/schemas", + PKGDATADIR "/schemas"); + if (!schema) + return NULL; + if (virXMLValidateAgainstSchema(schema, xml) < 0) { + VIR_FREE(schema); + return NULL; + } + VIR_FREE(schema); + } + + if (!(def = virDomainDefNew())) + return NULL; + + param.def = def; + + while (parse_funs[fun_index]) { + if (parse_funs[fun_index](¶m) < 0) + goto error; + fun_index++; + } + + /* Extract blkio cgroup tunables */ if (virXPathUInt("string(./blkiotune/weight)", ctxt, &def->blkio.weight) < 0) @@ -18995,23 +19034,6 @@ virDomainDefParseXML(xmlDocPtr xml, } VIR_FREE(nodes); - /* Extract other memory tunables */ - if (virDomainParseMemoryLimit("./memtune/hard_limit[1]", NULL, ctxt, - &def->mem.hard_limit) < 0) - goto error; - - if (virDomainParseMemoryLimit("./memtune/soft_limit[1]", NULL, ctxt, - &def->mem.soft_limit) < 0) - goto error; - - if (virDomainParseMemory("./memtune/min_guarantee[1]", NULL, ctxt, - &def->mem.min_guarantee, false, false) < 0) - goto error; - - if (virDomainParseMemoryLimit("./memtune/swap_hard_limit[1]", NULL, ctxt, - &def->mem.swap_hard_limit) < 0) - goto error; - if (virDomainVcpuParse(def, ctxt, xmlopt) < 0) goto error; -- 2.8.3

separate virDomainDefParseIoThreadInfo from virDomainDefParseXML --- src/conf/domain_conf.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4453621..1d74631 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18986,6 +18986,16 @@ virDomainDefParseVcpuInfo(virDomainParseTotalParamPtr param) } +static int +virDomainDefParseIoThreadInfo(virDomainParseTotalParamPtr param) +{ + if (virDomainDefParseIOThreads(param->def, param->ctxt) < 0) + return -1; + + return 0; +} + + static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr root, @@ -19034,6 +19044,7 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainDefParseMemoryInfo, virDomainDefParseBikiotuneInfo, virDomainDefParseVcpuInfo, + virDomainDefParseIoThreadInfo, NULL }; @@ -19061,9 +19072,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - if (virDomainDefParseIOThreads(def, ctxt) < 0) - goto error; - /* Extract cpu tunables. */ if ((n = virXPathULongLong("string(./cputune/shares[1])", ctxt, &def->cputune.shares)) < -1) { -- 2.8.3

separate virDomainDefParseCpuNumaInfo from virDomainDefParseXML --- src/conf/domain_conf.c | 77 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e50e56f..892e871 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19229,6 +19229,51 @@ virDomainDefParseCputuneInfo(virDomainParseTotalParamPtr param) } +static int +virDomainDefParseCpuNumaInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + int ret = -1; + + if (virCPUDefParseXML(ctxt, "./cpu[1]", VIR_CPU_TYPE_GUEST, &def->cpu) < 0) + goto cleanup; + + if (virDomainNumaDefCPUParseXML(def->numa, ctxt) < 0) + goto cleanup; + + if (virDomainNumaGetCPUCountTotal(def->numa) > virDomainDefGetVcpusMax(def)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Number of CPUs in <numa> exceeds the" + " <vcpu> count")); + goto cleanup; + } + + if (virDomainNumaGetMaxCPUID(def->numa) >= virDomainDefGetVcpusMax(def)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("CPU IDs in <numa> exceed the <vcpu> count")); + goto cleanup; + } + + if (virDomainNumatuneParseXML(def->numa, + def->placement_mode == + VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC, + ctxt) < 0) + goto cleanup; + + if (virDomainNumatuneHasPlacementAuto(def->numa) && + !def->cpumask && !virDomainDefHasVcpuPin(def) && + !def->cputune.emulatorpin && + !virDomainIOThreadIDArrayHasPin(def)) + def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO; + + ret = 0; + + cleanup: + return ret; +} + + static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr root, @@ -19279,6 +19324,7 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainDefParseVcpuInfo, virDomainDefParseIoThreadInfo, virDomainDefParseCputuneInfo, + virDomainDefParseCpuNumaInfo, NULL }; @@ -19306,37 +19352,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - if (virCPUDefParseXML(ctxt, "./cpu[1]", VIR_CPU_TYPE_GUEST, &def->cpu) < 0) - goto error; - - if (virDomainNumaDefCPUParseXML(def->numa, ctxt) < 0) - goto error; - - if (virDomainNumaGetCPUCountTotal(def->numa) > virDomainDefGetVcpusMax(def)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Number of CPUs in <numa> exceeds the" - " <vcpu> count")); - goto error; - } - - if (virDomainNumaGetMaxCPUID(def->numa) >= virDomainDefGetVcpusMax(def)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("CPU IDs in <numa> exceed the <vcpu> count")); - goto error; - } - - if (virDomainNumatuneParseXML(def->numa, - def->placement_mode == - VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC, - ctxt) < 0) - goto error; - - if (virDomainNumatuneHasPlacementAuto(def->numa) && - !def->cpumask && !virDomainDefHasVcpuPin(def) && - !def->cputune.emulatorpin && - !virDomainIOThreadIDArrayHasPin(def)) - def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO; - if ((n = virXPathNodeSet("./resource", ctxt, &nodes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot extract resource nodes")); -- 2.8.3

separate virDomainDefParseFeatureInfo from virDomainDefParseXML --- src/conf/domain_conf.c | 221 +++++++++++++++++++++++++++---------------------- 1 file changed, 122 insertions(+), 99 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 24bd240..b8fe24e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19307,94 +19307,27 @@ virDomainDefParseResourceInfo(virDomainParseTotalParamPtr param) } -static virDomainDefPtr -virDomainDefParseXML(xmlDocPtr xml, - xmlNodePtr root, - xmlXPathContextPtr ctxt, - virCapsPtr caps, - virDomainXMLOptionPtr xmlopt, - void *parseOpaque, - unsigned int flags) +static int +virDomainDefParseFeatureInfo(virDomainParseTotalParamPtr param) { - typedef int (*virDomainPreaseInfoFunc)(virDomainParseTotalParamPtr params); + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; - xmlNodePtr *nodes = NULL, node = NULL; - char *tmp = NULL; - size_t i, j; + int ret = -1; int n, gic_version; - size_t fun_index = 0; - virDomainDefPtr def; - bool uuid_generated = false; - virHashTablePtr bootHash = NULL; - bool usb_none = false; - bool usb_other = false; - bool usb_master = false; - char *netprefix = NULL; - virDomainParseTotalParam param = { - NULL, - xml, - root, - ctxt, - caps, - xmlopt, - parseOpaque, - flags, - false, - false, - false, - false - - }; - - virDomainPreaseInfoFunc parse_funs[] = { - virDomainDefParseIdInfo, - virDomainDefParseVirtTypeInfo, - virDomainDefParseOsNodeInfo, - virDomainDefParseDomainInfo, - virDomainDefParseSecurityLabelInfo, - virDomainDefParseMemoryInfo, - virDomainDefParseBikiotuneInfo, - virDomainDefParseVcpuInfo, - virDomainDefParseIoThreadInfo, - virDomainDefParseCputuneInfo, - virDomainDefParseCpuNumaInfo, - virDomainDefParseResourceInfo, - NULL - }; - - if (flags & VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA) { - char *schema = virFileFindResource("domain.rng", - abs_topsrcdir "/docs/schemas", - PKGDATADIR "/schemas"); - if (!schema) - return NULL; - if (virXMLValidateAgainstSchema(schema, xml) < 0) { - VIR_FREE(schema); - return NULL; - } - VIR_FREE(schema); - } - - if (!(def = virDomainDefNew())) - return NULL; - - param.def = def; - - while (parse_funs[fun_index]) { - if (parse_funs[fun_index](¶m) < 0) - goto error; - fun_index++; - } + char *tmp = NULL; + size_t i; + xmlNodePtr *nodes = NULL, node = NULL; if ((n = virXPathNodeSet("./features/*", ctxt, &nodes)) < 0) - goto error; + goto cleanup; for (i = 0; i < n; i++) { int val = virDomainFeatureTypeFromString((const char *)nodes[i]->name); if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unexpected feature '%s'"), nodes[i]->name); - goto error; + goto cleanup; } switch ((virDomainFeature) val) { @@ -19405,7 +19338,7 @@ virDomainDefParseXML(xmlDocPtr xml, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown value for attribute eoi: '%s'"), tmp); - goto error; + goto cleanup; } def->apic_eoi = eoi; VIR_FREE(tmp); @@ -19427,7 +19360,7 @@ virDomainDefParseXML(xmlDocPtr xml, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown policy attribute '%s' of feature '%s'"), tmp, virDomainFeatureTypeToString(val)); - goto error; + goto cleanup; } VIR_FREE(tmp); } else { @@ -19445,7 +19378,7 @@ virDomainDefParseXML(xmlDocPtr xml, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown state attribute '%s' of feature '%s'"), tmp, virDomainFeatureTypeToString(val)); - goto error; + goto cleanup; } VIR_FREE(tmp); } else { @@ -19459,7 +19392,7 @@ virDomainDefParseXML(xmlDocPtr xml, if (gic_version < 0 || gic_version == VIR_GIC_VERSION_NONE) { virReportError(VIR_ERR_XML_ERROR, _("malformed gic version: %s"), tmp); - goto error; + goto cleanup; } def->gic_version = gic_version; VIR_FREE(tmp); @@ -19475,7 +19408,7 @@ virDomainDefParseXML(xmlDocPtr xml, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown driver mode: %s"), tmp); - goto error; + goto cleanup; } def->ioapic = value; def->features[val] = VIR_TRISTATE_SWITCH_ON; @@ -19491,7 +19424,7 @@ virDomainDefParseXML(xmlDocPtr xml, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown HPT resizing setting: %s"), tmp); - goto error; + goto cleanup; } def->hpt_resizing = value; def->features[val] = VIR_TRISTATE_SWITCH_ON; @@ -19511,7 +19444,7 @@ virDomainDefParseXML(xmlDocPtr xml, int value; node = ctxt->node; if ((n = virXPathNodeSet("./features/hyperv/*", ctxt, &nodes)) < 0) - goto error; + goto cleanup; for (i = 0; i < n; i++) { feature = virDomainHypervTypeFromString((const char *)nodes[i]->name); @@ -19519,7 +19452,7 @@ virDomainDefParseXML(xmlDocPtr xml, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported HyperV Enlightenment feature: %s"), nodes[i]->name); - goto error; + goto cleanup; } ctxt->node = nodes[i]; @@ -19529,7 +19462,7 @@ virDomainDefParseXML(xmlDocPtr xml, _("missing 'state' attribute for " "HyperV Enlightenment feature '%s'"), nodes[i]->name); - goto error; + goto cleanup; } if ((value = virTristateSwitchTypeFromString(tmp)) < 0) { @@ -19537,7 +19470,7 @@ virDomainDefParseXML(xmlDocPtr xml, _("invalid value of state argument " "for HyperV Enlightenment feature '%s'"), nodes[i]->name); - goto error; + goto cleanup; } VIR_FREE(tmp); @@ -19561,14 +19494,14 @@ virDomainDefParseXML(xmlDocPtr xml, &def->hyperv_spinlocks) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid HyperV spinlock retry count")); - goto error; + goto cleanup; } if (def->hyperv_spinlocks < 0xFFF) { virReportError(VIR_ERR_XML_ERROR, "%s", _("HyperV spinlock retry count must be " "at least 4095")); - goto error; + goto cleanup; } break; @@ -19581,7 +19514,7 @@ virDomainDefParseXML(xmlDocPtr xml, virReportError(VIR_ERR_XML_ERROR, "%s", _("missing 'value' attribute for " "HyperV feature 'vendor_id'")); - goto error; + goto cleanup; } if (strlen(def->hyperv_vendor_id) > VIR_DOMAIN_HYPERV_VENDOR_ID_MAX) { @@ -19589,14 +19522,14 @@ virDomainDefParseXML(xmlDocPtr xml, _("HyperV vendor_id value must not be more " "than %d characters."), VIR_DOMAIN_HYPERV_VENDOR_ID_MAX); - goto error; + goto cleanup; } /* ensure that the string can be passed to qemu */ if (strchr(def->hyperv_vendor_id, ',')) { virReportError(VIR_ERR_XML_ERROR, "%s", _("HyperV vendor_id value is invalid")); - goto error; + goto cleanup; } /* coverity[dead_error_begin] */ @@ -19612,7 +19545,7 @@ virDomainDefParseXML(xmlDocPtr xml, int feature; int value; if ((n = virXPathNodeSet("./features/kvm/*", ctxt, &nodes)) < 0) - goto error; + goto cleanup; for (i = 0; i < n; i++) { feature = virDomainKVMTypeFromString((const char *)nodes[i]->name); @@ -19620,7 +19553,7 @@ virDomainDefParseXML(xmlDocPtr xml, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported KVM feature: %s"), nodes[i]->name); - goto error; + goto cleanup; } switch ((virDomainKVM) feature) { @@ -19630,7 +19563,7 @@ virDomainDefParseXML(xmlDocPtr xml, _("missing 'state' attribute for " "KVM feature '%s'"), nodes[i]->name); - goto error; + goto cleanup; } if ((value = virTristateSwitchTypeFromString(tmp)) < 0) { @@ -19638,7 +19571,7 @@ virDomainDefParseXML(xmlDocPtr xml, _("invalid value of state argument " "for KVM feature '%s'"), nodes[i]->name); - goto error; + goto cleanup; } VIR_FREE(tmp); @@ -19654,14 +19587,14 @@ virDomainDefParseXML(xmlDocPtr xml, } if ((n = virXPathNodeSet("./features/capabilities/*", ctxt, &nodes)) < 0) - goto error; + goto cleanup; for (i = 0; i < n; i++) { int val = virDomainCapsFeatureTypeFromString((const char *)nodes[i]->name); if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unexpected capability feature '%s'"), nodes[i]->name); - goto error; + goto cleanup; } if (val >= 0 && val < VIR_DOMAIN_CAPS_FEATURE_LAST) { @@ -19670,7 +19603,7 @@ virDomainDefParseXML(xmlDocPtr xml, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown state attribute '%s' of feature capability '%s'"), tmp, virDomainFeatureTypeToString(val)); - goto error; + goto cleanup; } VIR_FREE(tmp); } else { @@ -19680,6 +19613,96 @@ virDomainDefParseXML(xmlDocPtr xml, } VIR_FREE(nodes); + ret = 0; + + cleanup: + VIR_FREE(tmp); + VIR_FREE(nodes); + return ret; +} + + +static virDomainDefPtr +virDomainDefParseXML(xmlDocPtr xml, + xmlNodePtr root, + xmlXPathContextPtr ctxt, + virCapsPtr caps, + virDomainXMLOptionPtr xmlopt, + void *parseOpaque, + unsigned int flags) +{ + typedef int (*virDomainPreaseInfoFunc)(virDomainParseTotalParamPtr params); + + xmlNodePtr *nodes = NULL, node = NULL; + char *tmp = NULL; + size_t i, j; + int n; + size_t fun_index = 0; + virDomainDefPtr def; + bool uuid_generated = false; + virHashTablePtr bootHash = NULL; + bool usb_none = false; + bool usb_other = false; + bool usb_master = false; + char *netprefix = NULL; + virDomainParseTotalParam param = { + NULL, + xml, + root, + ctxt, + caps, + xmlopt, + parseOpaque, + flags, + false, + false, + false, + false + + }; + + virDomainPreaseInfoFunc parse_funs[] = { + virDomainDefParseIdInfo, + virDomainDefParseVirtTypeInfo, + virDomainDefParseOsNodeInfo, + virDomainDefParseDomainInfo, + virDomainDefParseSecurityLabelInfo, + virDomainDefParseMemoryInfo, + virDomainDefParseBikiotuneInfo, + virDomainDefParseVcpuInfo, + virDomainDefParseIoThreadInfo, + virDomainDefParseCputuneInfo, + virDomainDefParseCpuNumaInfo, + virDomainDefParseResourceInfo, + virDomainDefParseFeatureInfo, + NULL + }; + + if (flags & VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA) { + char *schema = virFileFindResource("domain.rng", + abs_topsrcdir "/docs/schemas", + PKGDATADIR "/schemas"); + if (!schema) + return NULL; + if (virXMLValidateAgainstSchema(schema, xml) < 0) { + VIR_FREE(schema); + return NULL; + } + VIR_FREE(schema); + } + + if (!(def = virDomainDefNew())) + return NULL; + + param.def = def; + + while (parse_funs[fun_index]) { + if (parse_funs[fun_index](¶m) < 0) + goto error; + fun_index++; + } + + if (virDomainEventActionParseXML(ctxt, "on_reboot", "string(./on_reboot[1])", &def->onReboot, -- 2.8.3

separate virDomainDefParsePMStateInfo from virDomainDefParseXML --- src/conf/domain_conf.c | 83 ++++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8374b9d..248472b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15329,29 +15329,6 @@ virDomainPerfEventDefParseXML(virDomainPerfDefPtr perf, return ret; } -static int -virDomainPerfDefParseXML(virDomainDefPtr def, - xmlXPathContextPtr ctxt) -{ - size_t i; - int ret = -1; - xmlNodePtr *nodes = NULL; - int n; - - if ((n = virXPathNodeSet("./perf/event", ctxt, &nodes)) < 0) - return n; - - for (i = 0; i < n; i++) { - if (virDomainPerfEventDefParseXML(&def->perf, nodes[i]) < 0) - goto cleanup; - } - - ret = 0; - - cleanup: - VIR_FREE(nodes); - return ret; -} static int virDomainMemorySourceDefParseXML(xmlNodePtr node, @@ -19660,6 +19637,51 @@ virDomainDefParseEventActionInfo(virDomainParseTotalParamPtr param) } +static int +virDomainDefParsePMStateInfo(virDomainParseTotalParamPtr param) +{ + int ret = -1; + if (virDomainPMStateParseXML(param->ctxt, + "string(./pm/suspend-to-mem/@enabled)", + ¶m->def->pm.s3) < 0) + goto cleanup; + + if (virDomainPMStateParseXML(param->ctxt, + "string(./pm/suspend-to-disk/@enabled)", + ¶m->def->pm.s4) < 0) + goto cleanup; + + ret = 0; + cleanup: + return ret; +} + + +static int +virDomainDefParsePerfEventInfo(virDomainParseTotalParamPtr param) +{ + size_t i; + int ret = -1; + xmlNodePtr *nodes = NULL; + int n; + + if ((n = virXPathNodeSet("./perf/event", param->ctxt, &nodes)) < 0) + return n; + + for (i = 0; i < n; i++) { + if (virDomainPerfEventDefParseXML(¶m->def->perf, nodes[i]) < 0) + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; + +} + + static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr root, @@ -19714,6 +19736,8 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainDefParseResourceInfo, virDomainDefParseFeatureInfo, virDomainDefParseEventActionInfo, + virDomainDefParsePMStateInfo, + virDomainDefParsePerfEventInfo, NULL }; @@ -19741,19 +19765,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - if (virDomainPMStateParseXML(ctxt, - "string(./pm/suspend-to-mem/@enabled)", - &def->pm.s3) < 0) - goto error; - - if (virDomainPMStateParseXML(ctxt, - "string(./pm/suspend-to-disk/@enabled)", - &def->pm.s4) < 0) - goto error; - - if (virDomainPerfDefParseXML(def, ctxt) < 0) - goto error; - if ((tmp = virXPathString("string(./clock/@offset)", ctxt)) && (def->clock.offset = virDomainClockOffsetTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 2.8.3

add bootHash to virDomainParseTotalParam --- src/conf/domain_conf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1e949ea..1a8248d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18516,6 +18516,7 @@ struct _virDomainParseTotalParam{ virCapsPtr caps; virDomainXMLOptionPtr xmlopt; void *parseOpaque; + virHashTablePtr bootHash; unsigned int flags; //internal parameters @@ -19816,6 +19817,7 @@ virDomainDefParseXML(xmlDocPtr xml, caps, xmlopt, parseOpaque, + NULL, flags, false, false, @@ -19861,7 +19863,11 @@ virDomainDefParseXML(xmlDocPtr xml, if (!(def = virDomainDefNew())) return NULL; + if (!(bootHash = virHashCreate(5, NULL))) + goto error; + param.def = def; + param.bootHash = bootHash; while (parse_funs[fun_index]) { if (parse_funs[fun_index](¶m) < 0) -- 2.8.3

separate virDomainDefParseDeviceInfo from virDomainDefParseXML, separate virDomainDefParseControllerInfo from virDomainDefParseXML, move virDomainDefParseControllerInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 153 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 101 insertions(+), 52 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 92a6522..22db391 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19793,6 +19793,106 @@ virDomainDefParseBootOptionsInfo(virDomainParseTotalParamPtr param) return 0; } + +static int +virDomainDefParseControllerInfo(virDomainParseTotalParamPtr param) + +{ + virDomainDefPtr def = param->def; + virDomainXMLOptionPtr xmlopt = param->xmlopt; + xmlXPathContextPtr ctxt = param->ctxt; + unsigned int flags = param->flags; + + int ret = -1; + int n = 0; + size_t i; + xmlNodePtr *nodes = NULL; + + /* analysis of the controller devices */ + if ((n = virXPathNodeSet("./devices/controller", ctxt, &nodes)) < 0) + goto cleanup; + + if (n && VIR_ALLOC_N(def->controllers, n) < 0) + goto cleanup; + + for (i = 0; i < n; i++) { + virDomainControllerDefPtr controller = virDomainControllerDefParseXML(xmlopt, + nodes[i], + ctxt, + flags); + + if (!controller) + goto cleanup; + + /* sanitize handling of "none" usb controller */ + if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) { + if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) { + if (param->usb_other || param->usb_none) { + virDomainControllerDefFree(controller); + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("Can't add another USB controller: " + "USB is disabled for this domain")); + goto cleanup; + } + param->usb_none = true; + } else { + if (param->usb_none) { + virDomainControllerDefFree(controller); + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("Can't add another USB controller: " + "USB is disabled for this domain")); + goto cleanup; + } + param->usb_other = true; + } + + if (controller->info.mastertype == VIR_DOMAIN_CONTROLLER_MASTER_NONE) + param->usb_master = true; + } + + virDomainControllerInsertPreAlloced(def, controller); + } + VIR_FREE(nodes); + + if (param->usb_other && !param->usb_master) { + virReportError(VIR_ERR_XML_DETAIL, "%s", + _("No master USB controller specified")); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; +} + + +static int +virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) +{ + typedef int (*virDomainPreaseDeviceFuc)(virDomainParseTotalParamPtr param); + int ret = -1; + size_t i = 0; + + virDomainPreaseDeviceFuc parseFuc[] = { + virDomainDefParseControllerInfo, + NULL + }; + + while (parseFuc[i]) { + if (parseFuc[i](param) < 0) + goto out; + i++; + } + ret = 0; + + out: + return ret; + + +} + static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr root, @@ -19813,8 +19913,6 @@ virDomainDefParseXML(xmlDocPtr xml, bool uuid_generated = false; virHashTablePtr bootHash = NULL; bool usb_none = false; - bool usb_other = false; - bool usb_master = false; char *netprefix = NULL; virDomainParseTotalParam param = { NULL, @@ -19852,6 +19950,7 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainDefParsePerfEventInfo, virDomainDefParseClockInfo, virDomainDefParseBootOptionsInfo, + virDomainDefParseDeviceInfo, NULL }; @@ -19905,57 +20004,7 @@ virDomainDefParseXML(xmlDocPtr xml, } VIR_FREE(nodes); - /* analysis of the controller devices */ - if ((n = virXPathNodeSet("./devices/controller", ctxt, &nodes)) < 0) - goto error; - - if (n && VIR_ALLOC_N(def->controllers, n) < 0) - goto error; - - for (i = 0; i < n; i++) { - virDomainControllerDefPtr controller = virDomainControllerDefParseXML(xmlopt, - nodes[i], - ctxt, - flags); - - if (!controller) - goto error; - - /* sanitize handling of "none" usb controller */ - if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) { - if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) { - if (usb_other || usb_none) { - virDomainControllerDefFree(controller); - virReportError(VIR_ERR_XML_DETAIL, "%s", - _("Can't add another USB controller: " - "USB is disabled for this domain")); - goto error; - } - usb_none = true; - } else { - if (usb_none) { - virDomainControllerDefFree(controller); - virReportError(VIR_ERR_XML_DETAIL, "%s", - _("Can't add another USB controller: " - "USB is disabled for this domain")); - goto error; - } - usb_other = true; - } - - if (controller->info.mastertype == VIR_DOMAIN_CONTROLLER_MASTER_NONE) - usb_master = true; - } - - virDomainControllerInsertPreAlloced(def, controller); - } - VIR_FREE(nodes); - if (usb_other && !usb_master) { - virReportError(VIR_ERR_XML_DETAIL, "%s", - _("No master USB controller specified")); - goto error; - } /* analysis of the resource leases */ if ((n = virXPathNodeSet("./devices/lease", ctxt, &nodes)) < 0) { -- 2.8.3

separate virDomainDefParseLeaseInfo from virDomainDefParseXML, move virDomainDefParseLeaseInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 54 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 903dfec..6a27294 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19911,6 +19911,40 @@ virDomainDefParseDisksInfo(virDomainParseTotalParamPtr param) static int +virDomainDefParseLeaseInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + + int ret = -1; + int n = 0; + size_t i; + xmlNodePtr *nodes = NULL; + + /* analysis of the resource leases */ + if ((n = virXPathNodeSet("./devices/lease", ctxt, &nodes)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot extract device leases")); + goto cleanup; + } + if (n && VIR_ALLOC_N(def->leases, n) < 0) + goto cleanup; + for (i = 0; i < n; i++) { + virDomainLeaseDefPtr lease = virDomainLeaseDefParseXML(nodes[i]); + if (!lease) + goto cleanup; + + def->leases[def->nleases++] = lease; + } + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; +} + + +static int virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) { typedef int (*virDomainPreaseDeviceFuc)(virDomainParseTotalParamPtr param); @@ -19920,6 +19954,7 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) virDomainPreaseDeviceFuc parseFuc[] = { virDomainDefParseControllerInfo, virDomainDefParseDisksInfo, + virDomainDefParseLeaseInfo, NULL }; @@ -19932,8 +19967,6 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) out: return ret; - - } @@ -20026,23 +20059,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* analysis of the resource leases */ - if ((n = virXPathNodeSet("./devices/lease", ctxt, &nodes)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot extract device leases")); - goto error; - } - if (n && VIR_ALLOC_N(def->leases, n) < 0) - goto error; - for (i = 0; i < n; i++) { - virDomainLeaseDefPtr lease = virDomainLeaseDefParseXML(nodes[i]); - if (!lease) - goto error; - - def->leases[def->nleases++] = lease; - } - VIR_FREE(nodes); - /* analysis of the filesystems */ if ((n = virXPathNodeSet("./devices/filesystem", ctxt, &nodes)) < 0) goto error; -- 2.8.3

separate virDomainDefParseInterfaceInfo from virDomainDefParseXML, move virDomainDefParseInterfaceInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 82 +++++++++++++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 31 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 72ddbd7..3448c42 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19981,6 +19981,56 @@ virDomainDefParseFilesystemInfo(virDomainParseTotalParamPtr param) static int +virDomainDefParseInterfaceInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + virDomainXMLOptionPtr xmlopt = param->xmlopt; + unsigned int flags = param->flags; + virHashTablePtr bootHash = param->bootHash; + virCapsPtr caps = param->caps; + + int ret = -1; + int n = 0; + size_t i; + char *netprefix = NULL; + xmlNodePtr *nodes = NULL; + + /* analysis of the network devices */ + if ((n = virXPathNodeSet("./devices/interface", ctxt, &nodes)) < 0) + goto cleanup; + if (n && VIR_ALLOC_N(def->nets, n) < 0) + goto cleanup; + netprefix = caps->host.netprefix; + for (i = 0; i < n; i++) { + virDomainNetDefPtr net = virDomainNetDefParseXML(xmlopt, + nodes[i], + ctxt, + bootHash, + netprefix, + flags); + if (!net) + goto cleanup; + + def->nets[def->nnets++] = net; + + /* <interface type='hostdev'> (and <interface type='net'> + * where the actual network type is already known to be + * hostdev) must also be in the hostdevs array. + */ + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_HOSTDEV && + virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net)) < 0) { + goto cleanup; + } + } + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; +} + +static int virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) { typedef int (*virDomainPreaseDeviceFuc)(virDomainParseTotalParamPtr param); @@ -19992,6 +20042,7 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) virDomainDefParseDisksInfo, virDomainDefParseLeaseInfo, virDomainDefParseFilesystemInfo, + virDomainDefParseInterfaceInfo, NULL }; @@ -20027,7 +20078,6 @@ virDomainDefParseXML(xmlDocPtr xml, bool uuid_generated = false; virHashTablePtr bootHash = NULL; bool usb_none = false; - char *netprefix = NULL; virDomainParseTotalParam param = { xml, root, @@ -20096,36 +20146,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* analysis of the network devices */ - if ((n = virXPathNodeSet("./devices/interface", ctxt, &nodes)) < 0) - goto error; - if (n && VIR_ALLOC_N(def->nets, n) < 0) - goto error; - netprefix = caps->host.netprefix; - for (i = 0; i < n; i++) { - virDomainNetDefPtr net = virDomainNetDefParseXML(xmlopt, - nodes[i], - ctxt, - bootHash, - netprefix, - flags); - if (!net) - goto error; - - def->nets[def->nnets++] = net; - - /* <interface type='hostdev'> (and <interface type='net'> - * where the actual network type is already known to be - * hostdev) must also be in the hostdevs array. - */ - if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_HOSTDEV && - virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net)) < 0) { - goto error; - } - } - VIR_FREE(nodes); - - /* analysis of the smartcard devices */ if ((n = virXPathNodeSet("./devices/smartcard", ctxt, &nodes)) < 0) goto error; -- 2.8.3

separate virDomainDefParseParallelInfo from virDomainDefParseXML, move virDomainDefParseParallelInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 77 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 28 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f818228..137b392 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20067,6 +20067,54 @@ virDomainDefParseSmartCardsInfo(virDomainParseTotalParamPtr param) return ret; } + +static int +virDomainDefParseParallelInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + virDomainXMLOptionPtr xmlopt = param->xmlopt; + unsigned int flags = param->flags; + + int ret = -1; + int n = 0; + size_t i, j; + xmlNodePtr *nodes = NULL; + + /* analysis of the character devices */ + if ((n = virXPathNodeSet("./devices/parallel", ctxt, &nodes)) < 0) + goto cleanup; + if (n && VIR_ALLOC_N(def->parallels, n) < 0) + goto cleanup; + + for (i = 0; i < n; i++) { + virDomainChrDefPtr chr = virDomainChrDefParseXML(xmlopt, + ctxt, + nodes[i], + def->seclabels, + def->nseclabels, + flags); + if (!chr) + goto cleanup; + + if (chr->target.port == -1) { + int maxport = -1; + for (j = 0; j < i; j++) { + if (def->parallels[j]->target.port > maxport) + maxport = def->parallels[j]->target.port; + } + chr->target.port = maxport + 1; + } + def->parallels[def->nparallels++] = chr; + } + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; +} + + static int virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) { @@ -20081,6 +20129,7 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) virDomainDefParseFilesystemInfo, virDomainDefParseInterfaceInfo, virDomainDefParseSmartCardsInfo, + virDomainDefParseParallelInfo, NULL }; @@ -20184,34 +20233,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* analysis of the character devices */ - if ((n = virXPathNodeSet("./devices/parallel", ctxt, &nodes)) < 0) - goto error; - if (n && VIR_ALLOC_N(def->parallels, n) < 0) - goto error; - - for (i = 0; i < n; i++) { - virDomainChrDefPtr chr = virDomainChrDefParseXML(xmlopt, - ctxt, - nodes[i], - def->seclabels, - def->nseclabels, - flags); - if (!chr) - goto error; - - if (chr->target.port == -1) { - int maxport = -1; - for (j = 0; j < i; j++) { - if (def->parallels[j]->target.port > maxport) - maxport = def->parallels[j]->target.port; - } - chr->target.port = maxport + 1; - } - def->parallels[def->nparallels++] = chr; - } - VIR_FREE(nodes); - if ((n = virXPathNodeSet("./devices/serial", ctxt, &nodes)) < 0) goto error; -- 2.8.3

separate virDomainDefParseConsoleInfo from virDomainDefParseXML, move virDomainDefParseConsoleInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 68 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c4743cf..b74e332 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20163,6 +20163,48 @@ virDomainDefParseSerialInfo(virDomainParseTotalParamPtr param) static int +virDomainDefParseConsoleInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + virDomainXMLOptionPtr xmlopt = param->xmlopt; + unsigned int flags = param->flags; + + int ret = -1; + int n = 0; + size_t i; + xmlNodePtr *nodes = NULL; + + if ((n = virXPathNodeSet("./devices/console", ctxt, &nodes)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot extract console devices")); + goto cleanup; + } + if (n && VIR_ALLOC_N(def->consoles, n) < 0) + goto cleanup; + + for (i = 0; i < n; i++) { + virDomainChrDefPtr chr = virDomainChrDefParseXML(xmlopt, + ctxt, + nodes[i], + def->seclabels, + def->nseclabels, + flags); + if (!chr) + goto cleanup; + + chr->target.port = i; + def->consoles[def->nconsoles++] = chr; + } + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; +} + + +static int virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) { typedef int (*virDomainPreaseDeviceFuc)(virDomainParseTotalParamPtr param); @@ -20178,6 +20220,7 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) virDomainDefParseSmartCardsInfo, virDomainDefParseParallelInfo, virDomainDefParseSerialInfo, + virDomainDefParseConsoleInfo, NULL }; @@ -20206,7 +20249,7 @@ virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr *nodes = NULL, node = NULL; char *tmp = NULL; - size_t i, j; + size_t i; int n; size_t fun_index = 0; virDomainDefPtr def; @@ -20281,29 +20324,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - if ((n = virXPathNodeSet("./devices/console", ctxt, &nodes)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot extract console devices")); - goto error; - } - if (n && VIR_ALLOC_N(def->consoles, n) < 0) - goto error; - - for (i = 0; i < n; i++) { - virDomainChrDefPtr chr = virDomainChrDefParseXML(xmlopt, - ctxt, - nodes[i], - def->seclabels, - def->nseclabels, - flags); - if (!chr) - goto error; - - chr->target.port = i; - def->consoles[def->nconsoles++] = chr; - } - VIR_FREE(nodes); - if ((n = virXPathNodeSet("./devices/channel", ctxt, &nodes)) < 0) goto error; if (n && VIR_ALLOC_N(def->channels, n) < 0) -- 2.8.3

separate virDomainDefParseInputInfo from virDomainDefParseXML, move virDomainDefParseInputInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 76 +++++++++++++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 28 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7c8fd45..eb610ed 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20243,6 +20243,53 @@ virDomainDefParseChannelInfo(virDomainParseTotalParamPtr param) static int +virDomainDefParseInputInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + virDomainXMLOptionPtr xmlopt = param->xmlopt; + unsigned int flags = param->flags; + + int ret = -1; + int n = 0; + size_t i; + xmlNodePtr *nodes = NULL; + + /* analysis of the input devices */ + if ((n = virXPathNodeSet("./devices/input", ctxt, &nodes)) < 0) + goto cleanup; + if (n && VIR_ALLOC_N(def->inputs, n) < 0) + goto cleanup; + + for (i = 0; i < n; i++) { + virDomainInputDefPtr input = virDomainInputDefParseXML(xmlopt, + def, + nodes[i], + ctxt, + flags); + if (!input) + goto cleanup; + + /* Check if USB bus is required */ + if (input->bus == VIR_DOMAIN_INPUT_BUS_USB && param->usb_none) { + virDomainInputDefFree(input); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can't add USB input device. " + "USB bus is disabled")); + goto cleanup; + } + + def->inputs[def->ninputs++] = input; + } + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; +} + + +static int virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) { typedef int (*virDomainPreaseDeviceFuc)(virDomainParseTotalParamPtr param); @@ -20260,6 +20307,7 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) virDomainDefParseSerialInfo, virDomainDefParseConsoleInfo, virDomainDefParseChannelInfo, + virDomainDefParseInputInfo, NULL }; @@ -20363,34 +20411,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* analysis of the input devices */ - if ((n = virXPathNodeSet("./devices/input", ctxt, &nodes)) < 0) - goto error; - if (n && VIR_ALLOC_N(def->inputs, n) < 0) - goto error; - - for (i = 0; i < n; i++) { - virDomainInputDefPtr input = virDomainInputDefParseXML(xmlopt, - def, - nodes[i], - ctxt, - flags); - if (!input) - goto error; - - /* Check if USB bus is required */ - if (input->bus == VIR_DOMAIN_INPUT_BUS_USB && usb_none) { - virDomainInputDefFree(input); - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Can't add USB input device. " - "USB bus is disabled")); - goto error; - } - - def->inputs[def->ninputs++] = input; - } - VIR_FREE(nodes); - /* analysis of the graphics devices */ if ((n = virXPathNodeSet("./devices/graphics", ctxt, &nodes)) < 0) goto error; -- 2.8.3

separate virDomainDefParseSoundInfo from virDomainDefParseXML, move virDomainDefParseSoundInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 54 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 71b5147..6ffde63 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20324,6 +20324,42 @@ virDomainDefParseGraphicsInfo(virDomainParseTotalParamPtr param) static int +virDomainDefParseSoundInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + virDomainXMLOptionPtr xmlopt = param->xmlopt; + unsigned int flags = param->flags; + + int ret = -1; + int n = 0; + size_t i; + xmlNodePtr *nodes = NULL; + + /* analysis of the sound devices */ + if ((n = virXPathNodeSet("./devices/sound", ctxt, &nodes)) < 0) + goto cleanup; + if (n && VIR_ALLOC_N(def->sounds, n) < 0) + goto cleanup; + for (i = 0; i < n; i++) { + virDomainSoundDefPtr sound = virDomainSoundDefParseXML(xmlopt, + nodes[i], + ctxt, + flags); + if (!sound) + goto cleanup; + + def->sounds[def->nsounds++] = sound; + } + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; +} + + +static int virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) { typedef int (*virDomainPreaseDeviceFuc)(virDomainParseTotalParamPtr param); @@ -20343,6 +20379,7 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) virDomainDefParseChannelInfo, virDomainDefParseInputInfo, virDomainDefParseGraphicsInfo, + virDomainDefParseSoundInfo, NULL }; @@ -20446,23 +20483,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* analysis of the sound devices */ - if ((n = virXPathNodeSet("./devices/sound", ctxt, &nodes)) < 0) - goto error; - if (n && VIR_ALLOC_N(def->sounds, n) < 0) - goto error; - for (i = 0; i < n; i++) { - virDomainSoundDefPtr sound = virDomainSoundDefParseXML(xmlopt, - nodes[i], - ctxt, - flags); - if (!sound) - goto error; - - def->sounds[def->nsounds++] = sound; - } - VIR_FREE(nodes); - /* analysis of the video devices */ if ((n = virXPathNodeSet("./devices/video", ctxt, &nodes)) < 0) goto error; -- 2.8.3

separate virDomainDefParseHostdevInfo from virDomainDefParseXML, move virDomainDefParseHostdevInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 91 +++++++++++++++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 35 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e2a4ce2..1e44e76 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20412,6 +20412,61 @@ virDomainDefParseVideoInfo(virDomainParseTotalParamPtr param) static int +virDomainDefParseHostdevInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + virDomainXMLOptionPtr xmlopt = param->xmlopt; + virHashTablePtr bootHash = param->bootHash; + unsigned int flags = param->flags; + + int ret = -1; + int n = 0; + size_t i; + xmlNodePtr *nodes = NULL; + + /* analysis of the host devices */ + if ((n = virXPathNodeSet("./devices/hostdev", ctxt, &nodes)) < 0) + goto cleanup; + if (n && VIR_REALLOC_N(def->hostdevs, def->nhostdevs + n) < 0) + goto cleanup; + for (i = 0; i < n; i++) { + virDomainHostdevDefPtr hostdev; + + hostdev = virDomainHostdevDefParseXML(xmlopt, nodes[i], ctxt, + bootHash, flags); + if (!hostdev) + goto cleanup; + + if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB && + param->usb_none) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can't add host USB device: " + "USB is disabled in this host")); + virDomainHostdevDefFree(hostdev); + goto cleanup; + } + + def->hostdevs[def->nhostdevs++] = hostdev; + + /* For a domain definition, we need to check if the controller + * for this hostdev exists yet and if not add it. This cannot be + * done during virDomainHostdevAssignAddress (as part of device + * post processing) because that will result in the failure to + * load the controller during hostdev hotplug. + */ + if (virDomainDefMaybeAddHostdevSCSIcontroller(def) < 0) + goto cleanup; + } + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; +} + + +static int virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) { typedef int (*virDomainPreaseDeviceFuc)(virDomainParseTotalParamPtr param); @@ -20433,6 +20488,7 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) virDomainDefParseGraphicsInfo, virDomainDefParseSoundInfo, virDomainDefParseVideoInfo, + virDomainDefParseHostdevInfo, NULL }; @@ -20536,41 +20592,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* analysis of the host devices */ - if ((n = virXPathNodeSet("./devices/hostdev", ctxt, &nodes)) < 0) - goto error; - if (n && VIR_REALLOC_N(def->hostdevs, def->nhostdevs + n) < 0) - goto error; - for (i = 0; i < n; i++) { - virDomainHostdevDefPtr hostdev; - - hostdev = virDomainHostdevDefParseXML(xmlopt, nodes[i], ctxt, - bootHash, flags); - if (!hostdev) - goto error; - - if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB && - usb_none) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Can't add host USB device: " - "USB is disabled in this host")); - virDomainHostdevDefFree(hostdev); - goto error; - } - - def->hostdevs[def->nhostdevs++] = hostdev; - - /* For a domain definition, we need to check if the controller - * for this hostdev exists yet and if not add it. This cannot be - * done during virDomainHostdevAssignAddress (as part of device - * post processing) because that will result in the failure to - * load the controller during hostdev hotplug. - */ - if (virDomainDefMaybeAddHostdevSCSIcontroller(def) < 0) - goto error; - } - VIR_FREE(nodes); - /* analysis of the watchdog devices */ def->watchdog = NULL; if ((n = virXPathNodeSet("./devices/watchdog", ctxt, &nodes)) < 0) -- 2.8.3

separate virDomainDefParseMemballoonInfo from virDomainDefParseXML, move virDomainDefParseMemballoonInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 58 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b2a1b34..42736e3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20505,6 +20505,43 @@ virDomainDefParseWatchdogInfo(virDomainParseTotalParamPtr param) static int +virDomainDefParseMemballoonInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + virDomainXMLOptionPtr xmlopt = param->xmlopt; + unsigned int flags = param->flags; + + int ret = -1; + int n = 0; + xmlNodePtr *nodes = NULL; + + /* analysis of the memballoon devices */ + def->memballoon = NULL; + if ((n = virXPathNodeSet("./devices/memballoon", ctxt, &nodes)) < 0) + goto cleanup; + if (n > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("only a single memory balloon device is supported")); + goto cleanup; + } + if (n > 0) { + virDomainMemballoonDefPtr memballoon; + + memballoon = virDomainMemballoonDefParseXML(xmlopt, nodes[0], ctxt, flags); + if (!memballoon) + goto cleanup; + + def->memballoon = memballoon; + } + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; +} + +static int virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) { typedef int (*virDomainPreaseDeviceFuc)(virDomainParseTotalParamPtr param); @@ -20528,6 +20565,7 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) virDomainDefParseVideoInfo, virDomainDefParseHostdevInfo, virDomainDefParseWatchdogInfo, + virDomainDefParseMemballoonInfo, NULL }; @@ -20631,26 +20669,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* analysis of the memballoon devices */ - def->memballoon = NULL; - if ((n = virXPathNodeSet("./devices/memballoon", ctxt, &nodes)) < 0) - goto error; - if (n > 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("only a single memory balloon device is supported")); - goto error; - } - if (n > 0) { - virDomainMemballoonDefPtr memballoon; - - memballoon = virDomainMemballoonDefParseXML(xmlopt, nodes[0], ctxt, flags); - if (!memballoon) - goto error; - - def->memballoon = memballoon; - VIR_FREE(nodes); - } - /* Parse the RNG devices */ if ((n = virXPathNodeSet("./devices/rng", ctxt, &nodes)) < 0) goto error; -- 2.8.3

separate virDomainDefParseTpmInfo from virDomainDefParseXML, move virDomainDefParseTpmInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 52 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a98841f..8f86c76 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20575,6 +20575,41 @@ virDomainDefParseRngInfo(virDomainParseTotalParamPtr param) return ret; } + +static int +virDomainDefParseTpmInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + virDomainXMLOptionPtr xmlopt = param->xmlopt; + unsigned int flags = param->flags; + + int ret = -1; + int n = 0; + xmlNodePtr *nodes = NULL; + + /* Parse the TPM devices */ + if ((n = virXPathNodeSet("./devices/tpm", ctxt, &nodes)) < 0) + goto cleanup; + + if (n > 1) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("only a single TPM device is supported")); + goto cleanup; + } + + if (n > 0) { + if (!(def->tpm = virDomainTPMDefParseXML(xmlopt, nodes[0], ctxt, flags))) + goto cleanup; + } + VIR_FREE(nodes); + + cleanup: + VIR_FREE(nodes); + return ret; +} + + static int virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) { @@ -20601,6 +20636,7 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) virDomainDefParseWatchdogInfo, virDomainDefParseMemballoonInfo, virDomainDefParseRngInfo, + virDomainDefParseTpmInfo, NULL }; @@ -20704,22 +20740,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* Parse the TPM devices */ - if ((n = virXPathNodeSet("./devices/tpm", ctxt, &nodes)) < 0) - goto error; - - if (n > 1) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("only a single TPM device is supported")); - goto error; - } - - if (n > 0) { - if (!(def->tpm = virDomainTPMDefParseXML(xmlopt, nodes[0], ctxt, flags))) - goto error; - } - VIR_FREE(nodes); - if ((n = virXPathNodeSet("./devices/nvram", ctxt, &nodes)) < 0) goto error; -- 2.8.3

separate virDomainDefParseHubInfo from virDomainDefParseXML, move virDomainDefParseHubInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 69 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 25 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 72b3f56..37fa996 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20645,6 +20645,49 @@ virDomainDefParseNvramInfo(virDomainParseTotalParamPtr param) static int +virDomainDefParseHubInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + virDomainXMLOptionPtr xmlopt = param->xmlopt; + unsigned int flags = param->flags; + + int ret = -1; + int n = 0; + size_t i; + xmlNodePtr *nodes = NULL; + + /* analysis of the hub devices */ + if ((n = virXPathNodeSet("./devices/hub", ctxt, &nodes)) < 0) + goto cleanup; + if (n && VIR_ALLOC_N(def->hubs, n) < 0) + goto cleanup; + for (i = 0; i < n; i++) { + virDomainHubDefPtr hub; + + hub = virDomainHubDefParseXML(xmlopt, nodes[i], flags); + if (!hub) + goto cleanup; + + if (hub->type == VIR_DOMAIN_HUB_TYPE_USB && param->usb_none) { + virDomainHubDefFree(hub); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can't add USB hub: " + "USB is disabled for this domain")); + goto cleanup; + } + + def->hubs[def->nhubs++] = hub; + } + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; +} + + +static int virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) { typedef int (*virDomainPreaseDeviceFuc)(virDomainParseTotalParamPtr param); @@ -20672,6 +20715,7 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) virDomainDefParseRngInfo, virDomainDefParseTpmInfo, virDomainDefParseNvramInfo, + virDomainDefParseHubInfo, NULL }; @@ -20706,7 +20750,6 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainDefPtr def; bool uuid_generated = false; virHashTablePtr bootHash = NULL; - bool usb_none = false; virDomainParseTotalParam param = { xml, root, @@ -20775,30 +20818,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* analysis of the hub devices */ - if ((n = virXPathNodeSet("./devices/hub", ctxt, &nodes)) < 0) - goto error; - if (n && VIR_ALLOC_N(def->hubs, n) < 0) - goto error; - for (i = 0; i < n; i++) { - virDomainHubDefPtr hub; - - hub = virDomainHubDefParseXML(xmlopt, nodes[i], flags); - if (!hub) - goto error; - - if (hub->type == VIR_DOMAIN_HUB_TYPE_USB && usb_none) { - virDomainHubDefFree(hub); - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Can't add USB hub: " - "USB is disabled for this domain")); - goto error; - } - - def->hubs[def->nhubs++] = hub; - } - VIR_FREE(nodes); - /* analysis of the redirected devices */ if ((n = virXPathNodeSet("./devices/redirdev", ctxt, &nodes)) < 0) goto error; -- 2.8.3

separate virDomainDefParseRedirFilterInfo from virDomainDefParseXML, move virDomainDefParseRedirFilterInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 55 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b90c83a..d19d4de 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20723,6 +20723,41 @@ virDomainDefParseRedirdevInfo(virDomainParseTotalParamPtr param) static int +virDomainDefParseRedirFilterInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + + int ret = -1; + int n = 0; + xmlNodePtr *nodes = NULL; + + /* analysis of the redirection filter rules */ + if ((n = virXPathNodeSet("./devices/redirfilter", ctxt, &nodes)) < 0) + goto cleanup; + if (n > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("only one set of redirection filter rule is supported")); + goto cleanup; + } + + if (n) { + virDomainRedirFilterDefPtr redirfilter = + virDomainRedirFilterDefParseXML(nodes[0], ctxt); + if (!redirfilter) + goto cleanup; + + def->redirfilter = redirfilter; + } + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; +} + + +static int virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) { typedef int (*virDomainPreaseDeviceFuc)(virDomainParseTotalParamPtr param); @@ -20752,6 +20787,7 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) virDomainDefParseNvramInfo, virDomainDefParseHubInfo, virDomainDefParseRedirdevInfo, + virDomainDefParseRedirFilterInfo, NULL }; @@ -20854,25 +20890,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* analysis of the redirection filter rules */ - if ((n = virXPathNodeSet("./devices/redirfilter", ctxt, &nodes)) < 0) - goto error; - if (n > 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("only one set of redirection filter rule is supported")); - goto error; - } - - if (n) { - virDomainRedirFilterDefPtr redirfilter = - virDomainRedirFilterDefParseXML(nodes[0], ctxt); - if (!redirfilter) - goto error; - - def->redirfilter = redirfilter; - } - VIR_FREE(nodes); - /* analysis of the panic devices */ if ((n = virXPathNodeSet("./devices/panic", ctxt, &nodes)) < 0) goto error; -- 2.8.3

separate virDomainDefParseShmemInfo from virDomainDefParseXML, move virDomainDefParseShmemInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 58 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 412e59c..281042f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20793,6 +20793,44 @@ virDomainDefParsePanicInfo(virDomainParseTotalParamPtr param) static int +virDomainDefParseShmemInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + virDomainXMLOptionPtr xmlopt = param->xmlopt; + unsigned int flags = param->flags; + + int ret = -1; + int n = 0; + size_t i; + xmlNodePtr *nodes = NULL, node=NULL; + + /* analysis of the shmem devices */ + if ((n = virXPathNodeSet("./devices/shmem", ctxt, &nodes)) < 0) + goto cleanup; + if (n && VIR_ALLOC_N(def->shmems, n) < 0) + goto cleanup; + + node = ctxt->node; + for (i = 0; i < n; i++) { + virDomainShmemDefPtr shmem; + ctxt->node = nodes[i]; + shmem = virDomainShmemDefParseXML(xmlopt, nodes[i], ctxt, flags); + if (!shmem) + goto cleanup; + + def->shmems[def->nshmems++] = shmem; + } + ctxt->node = node; + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; +} + + +static int virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) { typedef int (*virDomainPreaseDeviceFuc)(virDomainParseTotalParamPtr param); @@ -20824,6 +20862,7 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) virDomainDefParseRedirdevInfo, virDomainDefParseRedirFilterInfo, virDomainDefParsePanicInfo, + virDomainDefParseShmemInfo, NULL }; @@ -20926,25 +20965,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* analysis of the shmem devices */ - if ((n = virXPathNodeSet("./devices/shmem", ctxt, &nodes)) < 0) - goto error; - if (n && VIR_ALLOC_N(def->shmems, n) < 0) - goto error; - - node = ctxt->node; - for (i = 0; i < n; i++) { - virDomainShmemDefPtr shmem; - ctxt->node = nodes[i]; - shmem = virDomainShmemDefParseXML(xmlopt, nodes[i], ctxt, flags); - if (!shmem) - goto error; - - def->shmems[def->nshmems++] = shmem; - } - ctxt->node = node; - VIR_FREE(nodes); - /* analysis of memory devices */ if ((n = virXPathNodeSet("./devices/memory", ctxt, &nodes)) < 0) goto error; -- 2.8.3

separate virDomainDefParseIommuInfo from virDomainDefParseXML, move virDomainDefParseIommuInfo into virDomainDefParseDeviceInfo --- src/conf/domain_conf.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7d8b875..e6498c3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20868,6 +20868,37 @@ virDomainDefParseDeviceMemInfo(virDomainParseTotalParamPtr param) static int +virDomainDefParseIommuInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + + int ret = -1; + int n = 0; + xmlNodePtr *nodes = NULL; + + if ((n = virXPathNodeSet("./devices/iommu", ctxt, &nodes)) < 0) + goto cleanup; + + if (n > 1) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("only a single IOMMU device is supported")); + goto cleanup; + } + + if (n > 0) { + if (!(def->iommu = virDomainIOMMUDefParseXML(nodes[0], ctxt))) + goto cleanup; + } + ret = 0; + + cleanup: + VIR_FREE(nodes); + return ret; +} + + +static int virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) { typedef int (*virDomainPreaseDeviceFuc)(virDomainParseTotalParamPtr param); @@ -20901,6 +20932,7 @@ virDomainDefParseDeviceInfo(virDomainParseTotalParamPtr param) virDomainDefParsePanicInfo, virDomainDefParseShmemInfo, virDomainDefParseDeviceMemInfo, + virDomainDefParseIommuInfo, NULL }; @@ -21002,21 +21034,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - if ((n = virXPathNodeSet("./devices/iommu", ctxt, &nodes)) < 0) - goto error; - - if (n > 1) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("only a single IOMMU device is supported")); - goto error; - } - - if (n > 0) { - if (!(def->iommu = virDomainIOMMUDefParseXML(nodes[0], ctxt))) - goto error; - } - VIR_FREE(nodes); - /* analysis of the user namespace mapping */ if ((n = virXPathNodeSet("./idmap/uid", ctxt, &nodes)) < 0) goto error; -- 2.8.3

separate virDomainDefParseSysinfoInfo from virDomainDefParseXML --- src/conf/domain_conf.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index de8a9fc..a8fc27c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -20997,6 +20997,33 @@ virDomainDefParseIdmapInfo(virDomainParseTotalParamPtr param) } +static int +virDomainDefParseSysinfoInfo(virDomainParseTotalParamPtr param) +{ + virDomainDefPtr def = param->def; + xmlXPathContextPtr ctxt = param->ctxt; + bool uuid_generated = param->uuid_generated; + + int ret = -1; + xmlNodePtr node = NULL; + + if ((node = virXPathNode("./sysinfo[1]", ctxt)) != NULL) { + xmlNodePtr oldnode = ctxt->node; + ctxt->node = node; + def->sysinfo = virSysinfoParseXML(node, ctxt, + def->uuid, uuid_generated); + ctxt->node = oldnode; + + if (def->sysinfo == NULL) + goto cleanup; + } + ret = 0; + + cleanup: + return ret; +} + + static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr root, @@ -21012,7 +21039,6 @@ virDomainDefParseXML(xmlDocPtr xml, char *tmp = NULL; size_t fun_index = 0; virDomainDefPtr def; - bool uuid_generated = false; virHashTablePtr bootHash = NULL; virDomainParseTotalParam param = { xml, @@ -21052,6 +21078,7 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainDefParseBootOptionsInfo, virDomainDefParseDeviceInfo, virDomainDefParseIdmapInfo, + virDomainDefParseSysinfoInfo, NULL }; @@ -21083,17 +21110,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - if ((node = virXPathNode("./sysinfo[1]", ctxt)) != NULL) { - xmlNodePtr oldnode = ctxt->node; - ctxt->node = node; - def->sysinfo = virSysinfoParseXML(node, ctxt, - def->uuid, uuid_generated); - ctxt->node = oldnode; - - if (def->sysinfo == NULL) - goto error; - } - if (virDomainKeyWrapDefParseXML(def, ctxt) < 0) goto error; -- 2.8.3

separate virDomainDefParseMetadataInfo from virDomainDefParseXML --- src/conf/domain_conf.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 03bf5ad..7006e7f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21034,6 +21034,17 @@ virDomainDefParseKeyWrapInfo(virDomainParseTotalParamPtr param) } +static int +virDomainDefParseMetadataInfo(virDomainParseTotalParamPtr param) +{ + xmlNodePtr node = NULL; + /* Extract custom metadata */ + if ((node = virXPathNode("./metadata[1]", param->ctxt)) != NULL) + param->def->metadata = xmlCopyNode(node, 1); + + return 0; +} + static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr root, @@ -21045,8 +21056,6 @@ virDomainDefParseXML(xmlDocPtr xml, { typedef int (*virDomainPreaseInfoFunc)(virDomainParseTotalParamPtr params); - xmlNodePtr *nodes = NULL, node = NULL; - char *tmp = NULL; size_t fun_index = 0; virDomainDefPtr def; virHashTablePtr bootHash = NULL; @@ -21090,6 +21099,7 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainDefParseIdmapInfo, virDomainDefParseSysinfoInfo, virDomainDefParseKeyWrapInfo, + virDomainDefParseMetadataInfo, NULL }; @@ -21121,10 +21131,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* Extract custom metadata */ - if ((node = virXPathNode("./metadata[1]", ctxt)) != NULL) - def->metadata = xmlCopyNode(node, 1); - /* we have to make a copy of all of the callback pointers here since * we won't have the virCaps structure available during free */ @@ -21148,8 +21154,6 @@ virDomainDefParseXML(xmlDocPtr xml, return def; error: - VIR_FREE(tmp); - VIR_FREE(nodes); virHashFree(bootHash); virDomainDefFree(def); return NULL; -- 2.8.3

separate virDomainDefPostParseInternalInfo from virDomainDefParseXML --- src/conf/domain_conf.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7caff3a..0f2450a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21064,6 +21064,23 @@ virDomainDefParseNameSpaceInfo(virDomainParseTotalParamPtr param) return 0; } + +static int +virDomainDefPostParseInternalInfo(virDomainParseTotalParamPtr param) +{ + /* callback to fill driver specific domain aspects */ + if (virDomainDefPostParseInternal(param->def, + param->caps, + param->flags, + param->xmlopt, + param->parseOpaque, + param->bootHash) < 0) + return -1; + + return 0; +} + + static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr root, @@ -21120,6 +21137,7 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainDefParseKeyWrapInfo, virDomainDefParseMetadataInfo, virDomainDefParseNameSpaceInfo, + virDomainDefPostParseInternalInfo, NULL }; @@ -21151,11 +21169,6 @@ virDomainDefParseXML(xmlDocPtr xml, fun_index++; } - /* callback to fill driver specific domain aspects */ - if (virDomainDefPostParseInternal(def, caps, flags, xmlopt, parseOpaque, - bootHash) < 0) - goto error; - /* valdiate configuration */ if (virDomainDefValidate(def, caps, flags, xmlopt) < 0) goto error; -- 2.8.3

[...] So your series went through rather messed up. I see at least two different copies of patch 2/something. On Thu, Feb 08, 2018 at 14:45:59 +0800, xinhua.Cao wrote:

beacause virDomainDefParseXML is too long, and all domain xml parse in this function, it's difficulty to maintain this function so separate virDomainDefParseXML into serial parts use virDomainPreaseInfoFunc. then it will easy to maintain

So this commit message should describe what this patch is using, but it's not.

--- src/conf/domain_conf.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 34aae82..e36783b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18527,6 +18527,28 @@ virDomainCachetuneDefParse(virDomainDefPtr def, }

+typedef struct _virDomainParseTotalParam virDomainParseTotalParam; +typedef virDomainParseTotalParam *virDomainParseTotalParamPtr; + +struct _virDomainParseTotalParam{ + //input parameters

We use only old-style comments.

+ virDomainDefPtr def; + xmlDocPtr xml; + xmlNodePtr root; + xmlXPathContextPtr ctxt; + virCapsPtr caps; + virDomainXMLOptionPtr xmlopt; + void *parseOpaque; + unsigned int flags; + + //internal parameters + bool usb_none; + bool usb_other; + bool usb_master; + bool uuid_generated; +}; + + static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr root, @@ -18536,11 +18558,14 @@ virDomainDefParseXML(xmlDocPtr xml, void *parseOpaque, unsigned int flags) { + typedef int (*virDomainPreaseInfoFunc)(virDomainParseTotalParamPtr params);

Typo in the name and also you should not typedef in the functions.

+ xmlNodePtr *nodes = NULL, node = NULL; char *tmp = NULL; size_t i, j; int n, virtType, gic_version; long id = -1; + size_t fun_index = 0; virDomainDefPtr def; bool uuid_generated = false; virHashTablePtr bootHash = NULL; @@ -18548,6 +18573,25 @@ virDomainDefParseXML(xmlDocPtr xml, bool usb_other = false; bool usb_master = false; char *netprefix = NULL; + virDomainParseTotalParam param = { + NULL, + xml, + root, + ctxt, + caps, + xmlopt, + parseOpaque, + flags, + false, + false, + false, + false + + }; + + virDomainPreaseInfoFunc parse_funs[] = { + NULL + };

if (flags & VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA) { char *schema = virFileFindResource("domain.rng", @@ -18565,6 +18609,14 @@ virDomainDefParseXML(xmlDocPtr xml, if (!(def = virDomainDefNew())) return NULL;

+ param.def = def; + + while (parse_funs[fun_index]) { + if (parse_funs[fun_index](¶m) < 0) + goto error; + fun_index++; + }

NACK to this. I prefer if the functions are visible in the code in the correct order, so please don't try to load them from an array of callbacks. I don't see any benefit of this.