External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-09 17:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: domain: Store capability overrides in NULL-terminated string list

Browse Source 
We always process the full list so there's no value in storing the count
separately.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-06-21 14:54:24 +02:00
parent b7b8ea965b
commit d1aa253730
3 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/qemu/qemu_domain.c
View File

@ -3331,8 +3331,8 @@ qemuDomainXmlNsDefFree(qemuDomainXmlNsDef *def)
g_free(def->env); g_free(def->env);
virStringListFreeCount(def->args, def->num_args); virStringListFreeCount(def->args, def->num_args);
virStringListFreeCount(def->capsadd, def->ncapsadd); g_strfreev(def->capsadd);
virStringListFreeCount(def->capsdel, def->ncapsdel); g_strfreev(def->capsdel);
g_free(def->deprecationBehavior); g_free(def->deprecationBehavior);
@ -3448,10 +3448,10 @@ qemuDomainDefNamespaceParseCaps(qemuDomainXmlNsDef *nsdef,
return -1; return -1;
if (nnodesadd > 0) { if (nnodesadd > 0) {
nsdef->capsadd = g_new0(char *, nnodesadd); nsdef->capsadd = g_new0(char *, nnodesadd + 1);
for (i = 0; i < nnodesadd; i++) { for (i = 0; i < nnodesadd; i++) {
if (!(nsdef->capsadd[nsdef->ncapsadd++] = virXMLPropString(nodesadd[i], "capability"))) { if (!(nsdef->capsadd[i] = virXMLPropString(nodesadd[i], "capability"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing capability name")); _("missing capability name"));
return -1; return -1;
@ -3460,10 +3460,10 @@ qemuDomainDefNamespaceParseCaps(qemuDomainXmlNsDef *nsdef,
} }
if (nnodesdel > 0) { if (nnodesdel > 0) {
nsdef->capsdel = g_new0(char *, nnodesdel); nsdef->capsdel = g_new0(char *, nnodesdel + 1);
for (i = 0; i < nnodesdel; i++) { for (i = 0; i < nnodesdel; i++) {
if (!(nsdef->capsdel[nsdef->ncapsdel++] = virXMLPropString(nodesdel[i], "capability"))) { if (!(nsdef->capsdel[i] = virXMLPropString(nodesdel[i], "capability"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing capability name")); _("missing capability name"));
return -1; return -1;
@ -3492,7 +3492,7 @@ qemuDomainDefNamespaceParse(xmlXPathContextPtr ctxt,
nsdata->deprecationBehavior = virXPathString("string(./qemu:deprecation/@behavior)", ctxt); nsdata->deprecationBehavior = virXPathString("string(./qemu:deprecation/@behavior)", ctxt);
if (nsdata->num_args > 0 || nsdata->num_env > 0 || if (nsdata->num_args > 0 || nsdata->num_env > 0 ||
nsdata->ncapsadd > 0 || nsdata->ncapsdel > 0 || nsdata->capsadd || nsdata->capsdel ||
nsdata->deprecationBehavior) nsdata->deprecationBehavior)
*data = g_steal_pointer(&nsdata); *data = g_steal_pointer(&nsdata);
@ -3534,19 +3534,19 @@ static void
qemuDomainDefNamespaceFormatXMLCaps(virBuffer *buf, qemuDomainDefNamespaceFormatXMLCaps(virBuffer *buf,
qemuDomainXmlNsDef *xmlns) qemuDomainXmlNsDef *xmlns)
{ {
size_t i; GStrv n;
if (!xmlns->ncapsadd && !xmlns->ncapsdel) if (!xmlns->capsadd && !xmlns->capsdel)
return; return;
virBufferAddLit(buf, "<qemu:capabilities>\n"); virBufferAddLit(buf, "<qemu:capabilities>\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
for (i = 0; i < xmlns->ncapsadd; i++) for (n = xmlns->capsadd; n && *n; n++)
virBufferEscapeString(buf, "<qemu:add capability='%s'/>\n", xmlns->capsadd[i]); virBufferEscapeString(buf, "<qemu:add capability='%s'/>\n", *n);
for (i = 0; i < xmlns->ncapsdel; i++) for (n = xmlns->capsdel; n && *n; n++)
virBufferEscapeString(buf, "<qemu:del capability='%s'/>\n", xmlns->capsdel[i]); virBufferEscapeString(buf, "<qemu:del capability='%s'/>\n", *n);
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</qemu:capabilities>\n"); virBufferAddLit(buf, "</qemu:capabilities>\n");
@ -6617,7 +6617,7 @@ void qemuDomainObjCheckTaint(virQEMUDriver *driver,
qemuDomainXmlNsDef *qemuxmlns = obj->def->namespaceData; qemuDomainXmlNsDef *qemuxmlns = obj->def->namespaceData;
if (qemuxmlns->num_args || qemuxmlns->num_env) if (qemuxmlns->num_args || qemuxmlns->num_env)
qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CUSTOM_ARGV, logCtxt); qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CUSTOM_ARGV, logCtxt);
if (qemuxmlns->ncapsadd > 0 || qemuxmlns->ncapsdel > 0) if (qemuxmlns->capsadd || qemuxmlns->capsdel)
custom_hypervisor_feat = true; custom_hypervisor_feat = true;
} }

2
src/qemu/qemu_domain.h
View File

@ -471,10 +471,8 @@ struct _qemuDomainXmlNsDef {
unsigned int num_env; unsigned int num_env;
qemuDomainXmlNsEnvTuple *env; qemuDomainXmlNsEnvTuple *env;
size_t ncapsadd;
char **capsadd; char **capsadd;
size_t ncapsdel;
char **capsdel; char **capsdel;
/* We deliberately keep this as a string so that it's parsed only when /* We deliberately keep this as a string so that it's parsed only when

13
src/qemu/qemu_process.c
View File

@ -5484,7 +5484,6 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm)
qemuDomainXmlNsDef *nsdef = vm->def->namespaceData; qemuDomainXmlNsDef *nsdef = vm->def->namespaceData;
char **next; char **next;
int tmp; int tmp;
size_t i;
if (cfg->capabilityfilters) { if (cfg->capabilityfilters) {
for (next = cfg->capabilityfilters; *next; next++) { for (next = cfg->capabilityfilters; *next; next++) {
@ -5500,22 +5499,22 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm)
} }
if (nsdef) { if (nsdef) {
for (i = 0; i < nsdef->ncapsadd; i++) { for (next = nsdef->capsadd; next && *next; next++) {
if ((tmp = virQEMUCapsTypeFromString(nsdef->capsadd[i])) < 0) { if ((tmp = virQEMUCapsTypeFromString(*next)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("invalid qemu namespace capability '%s'"), _("invalid qemu namespace capability '%s'"),
nsdef->capsadd[i]); *next);
return -1; return -1;
} }
virQEMUCapsSet(priv->qemuCaps, tmp); virQEMUCapsSet(priv->qemuCaps, tmp);
} }
for (i = 0; i < nsdef->ncapsdel; i++) { for (next = nsdef->capsdel; next && *next; next++) {
if ((tmp = virQEMUCapsTypeFromString(nsdef->capsdel[i])) < 0) { if ((tmp = virQEMUCapsTypeFromString(*next)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("invalid qemu namespace capability '%s'"), _("invalid qemu namespace capability '%s'"),
nsdef->capsdel[i]); *next);
return -1; return -1;
} }