NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

src/xenxs: Refactor code formating vif device config

Browse Source 
Handle formating of VIF config in a new function xenFormatXMVif().

Signed-off-by: Kiarie Kahurani <davidkiarie4@gmail.com>
This commit is contained in:
Jim Fehlig 2014-08-13 14:46:16 -06:00
parent 2e2ac1ed4a
commit 62c817e516
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/xenxs/xen_xm.c
View File

@ -2308,6 +2308,43 @@ xenFormatXMInputDevs(virConfPtr conf, virDomainDefPtr def)
} }
static int
xenFormatXMVif(virConfPtr conf,
virConnectPtr conn,
virDomainDefPtr def,
int xendConfigVersion)
{
virConfValuePtr netVal = NULL;
size_t i;
int hvm = STREQ(def->os.type, "hvm");
if (VIR_ALLOC(netVal) < 0)
goto cleanup;
netVal->type = VIR_CONF_LIST;
netVal->list = NULL;
for (i = 0; i < def->nnets; i++) {
if (xenFormatXMNet(conn, netVal, def->nets[i],
hvm, xendConfigVersion) < 0)
goto cleanup;
}
if (netVal->list != NULL) {
int ret = virConfSetValue(conf, "vif", netVal);
netVal = NULL;
if (ret < 0)
goto cleanup;
}
VIR_FREE(netVal);
return 0;
cleanup:
virConfFreeValue(netVal);
return -1;
}
/* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is
either 32, or 64 on a platform where long is big enough. */ either 32, or 64 on a platform where long is big enough. */
verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT); verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT);
@ -2318,9 +2355,6 @@ xenFormatXM(virConnectPtr conn,
int xendConfigVersion) int xendConfigVersion)
{ {
virConfPtr conf = NULL; virConfPtr conf = NULL;
int hvm = STREQ(def->os.type, "hvm") ? 1 : 0;
size_t i;
virConfValuePtr netVal = NULL;
if (!(conf = virConfNew())) if (!(conf = virConfNew()))
goto cleanup; goto cleanup;
@ -2361,23 +2395,8 @@ xenFormatXM(virConnectPtr conn,
if (xenFormatXMDisks(conf, def, xendConfigVersion) < 0) if (xenFormatXMDisks(conf, def, xendConfigVersion) < 0)
goto cleanup; goto cleanup;
if (VIR_ALLOC(netVal) < 0) if (xenFormatXMVif(conf, conn, def, xendConfigVersion) < 0)
goto cleanup; goto cleanup;
netVal->type = VIR_CONF_LIST;
netVal->list = NULL;
for (i = 0; i < def->nnets; i++) {
if (xenFormatXMNet(conn, netVal, def->nets[i],
hvm, xendConfigVersion) < 0)
goto cleanup;
}
if (netVal->list != NULL) {
int ret = virConfSetValue(conf, "vif", netVal);
netVal = NULL;
if (ret < 0)
goto cleanup;
}
VIR_FREE(netVal);
if (xenFormatXMPCI(conf, def) < 0) if (xenFormatXMPCI(conf, def) < 0)
goto cleanup; goto cleanup;
@ -2391,7 +2410,6 @@ xenFormatXM(virConnectPtr conn,
return conf; return conf;
cleanup: cleanup:
virConfFreeValue(netVal);
if (conf) if (conf)
virConfFree(conf); virConfFree(conf);
return NULL; return NULL;