Re: [libvirt] [PATCH 2/2] conf: Introduce the virDomainNetModel enumeration

Up until now, we have stored the model name for network interfaces as raw strings in virDomainNetDef: this is suboptimal for a number of reasons, such as having to perform relatively expensive string allocations and comparisons all the time and not giving the compiler the opportunity to have our back in certain situations. Replace the strings with an enumeration similar to the ones we already use for pretty much everything else. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- Most drivers already performed pretty strict validation of the model name, so there should be no problems there; the QEMU driver, however, though it would be a good idea to just accept any string that possibly kinda resembled a valid model name. The models I've included in the enumeration are those that were already referenced somewhere else in libvirt, but there's no guarantee that other model names are not used in the wild. One possibility would be to also add (a subset of) all models QEMU ever supported, even though some of them might have never been used, just to be safe; on the other side of the spectrum, we could go with the minimal set and possibly add more if breakages are reported.

@@ -10330,18 +10349,20 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, * i82551 i82557b i82559er ne2k_pci pcnet rtl8139 e1000 virtio * QEMU PPC64 supports spapr-vlan */ - if (model != NULL) { - if (strspn(model, NET_MODEL_CHARS) < strlen(model)) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("Model name contains invalid characters")); + if (model) { + if ((val = virDomainNetModelTypeFromString(model)) < 0 || + val == VIR_DOMAIN_NET_MODEL_NONE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unknown interface <model type='%s'> " + "has been specified"), + model); goto error;