External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

src/xenconfig: wrap common parsing code

Browse Source 
Wrap parsing code common to xm and xl in xenParseConfigCommon
and export it.

Signed-off-by: Kiarie Kahurani <davidkiarie4@gmail.com>
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Kiarie Kahurani 2014-08-12 00:21:24 +03:00 committed by Jim Fehlig
parent 870c90c70f
commit 512f673835
2 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/xenconfig/xen_xm.c
View File

@ -1263,12 +1263,59 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def)
}
int
xenParseConfigCommon(virConfPtr conf,
virDomainDefPtr def,
virCapsPtr caps,
int xendConfigVersion)
{
if (xenParseXMGeneralMeta(conf, def, caps) < 0)
return -1;
if (xenParseXMOS(conf, def) < 0)
return -1;
if (xenParseXMMem(conf, def) < 0)
return -1;
if (xenParseXMEventsActions(conf, def) < 0)
return -1;
if (xenParseXMCPUFeatures(conf, def) < 0)
return -1;
if (xenParseXMTimeOffset(conf, def, xendConfigVersion) < 0)
return -1;
if (xenXMConfigCopyStringOpt(conf, "device_model", &def->emulator) < 0)
return -1;
if (xenParseXMVif(conf, def) < 0)
return -1;
if (xenParseXMPCI(conf, def) < 0)
return -1;
if (xenParseXMEmulatedDevices(conf, def) < 0)
return -1;
if (xenParseXMVfb(conf, def, xendConfigVersion) < 0)
return -1;
if (xenParseXMCharDev(conf, def) < 0)
return -1;
return 0;
}
/*
* Turn a config record into a lump of XML describing the
* domain, suitable for later feeding for virDomainCreateXML
*/
virDomainDefPtr
xenParseXM(virConfPtr conf, int xendConfigVersion,
xenParseXM(virConfPtr conf,
int xendConfigVersion,
virCapsPtr caps)
{
virDomainDefPtr def = NULL;
@ -1279,44 +1326,11 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
def->virtType = VIR_DOMAIN_VIRT_XEN;
def->id = -1;
if (xenParseXMGeneralMeta(conf, def, caps) < 0)
goto cleanup;
if (xenParseXMOS(conf, def) < 0)
goto cleanup;
if (xenParseXMMem(conf, def) < 0)
goto cleanup;
if (xenParseXMEventsActions(conf, def) < 0)
goto cleanup;
if (xenParseXMCPUFeatures(conf, def) < 0)
goto cleanup;
if (xenParseXMTimeOffset(conf, def, xendConfigVersion) < 0)
if (xenParseConfigCommon(conf, def, caps, xendConfigVersion) < 0)
goto cleanup;
if (xenParseXMDisk(conf, def, xendConfigVersion) < 0)
goto cleanup;
if (xenXMConfigCopyStringOpt(conf, "device_model", &def->emulator) < 0)
goto cleanup;
if (xenParseXMVif(conf, def) < 0)
goto cleanup;
if (xenParseXMPCI(conf, def) < 0)
goto cleanup;
if (xenParseXMEmulatedDevices(conf, def) < 0)
goto cleanup;
if (xenParseXMVfb(conf, def, xendConfigVersion) < 0)
goto cleanup;
if (xenParseXMCharDev(conf, def) < 0)
goto cleanup;
goto cleanup;
return def;

5
src/xenconfig/xen_xm.h
View File

@ -36,4 +36,9 @@ virConfPtr xenFormatXM(virConnectPtr conn, virDomainDefPtr def,
virDomainDefPtr xenParseXM(virConfPtr conf, int xendConfigVersion,
virCapsPtr caps);
int xenParseConfigCommon(virConfPtr conf,
virDomainDefPtr def,
virCapsPtr caps,
int xendConfigVersion);
#endif /* __VIR_XEN_XM_H__ */