From ff7e0a1a40d69d69613d8fb88eb0263fc1121a8d Mon Sep 17 00:00:00 2001 From: Jim Fehlig Date: Wed, 16 Aug 2017 15:45:54 -0600 Subject: [PATCH] Fix building domain def in securityselinuxtest The virDomainDef created by testBuildDomainDef in securityselinuxtest adds a seclabel but does not increment nseclabels. Also, it should populate seclabel->model with 'selinux'. While at it, use the secdef itself to populate values instead of the indirection through def->seclabels[0]. --- tests/securityselinuxtest.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 767b6cc026..f6bc07a846 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -73,24 +73,27 @@ testBuildDomainDef(bool dynamic, if (!(def = virDomainDefNew())) goto error; + def->virtType = VIR_DOMAIN_VIRT_KVM; if (VIR_ALLOC_N(def->seclabels, 1) < 0) goto error; if (VIR_ALLOC(secdef) < 0) goto error; - def->virtType = VIR_DOMAIN_VIRT_KVM; - def->seclabels[0] = secdef; - def->seclabels[0]->type = dynamic ? VIR_DOMAIN_SECLABEL_DYNAMIC : VIR_DOMAIN_SECLABEL_STATIC; + if (VIR_STRDUP(secdef->model, "selinux") < 0) + goto error; + secdef->type = dynamic ? VIR_DOMAIN_SECLABEL_DYNAMIC : VIR_DOMAIN_SECLABEL_STATIC; if (label && - VIR_STRDUP(def->seclabels[0]->label, label) < 0) + VIR_STRDUP(secdef->label, label) < 0) goto error; if (baselabel && - VIR_STRDUP(def->seclabels[0]->baselabel, baselabel) < 0) + VIR_STRDUP(secdef->baselabel, baselabel) < 0) goto error; + def->seclabels[0] = secdef; + def->nseclabels++; return def; error: -- 2.39.5