External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 14:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

src/xenxs: Refactor code parsing general config

Browse Source 
introduce function
   xenParseXMGeneralMeta(virConfPtr conf, .......);
which parses general metadata instead

Signed-off-by: Kiarie Kahurani <davidkiarie4@gmail.com>
This commit is contained in:
Kiarie Kahurani 2014-08-07 21:33:00 +03:00 committed by Jim Fehlig
parent 3631f5dfc6
commit 24543c6571
1 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/xenxs/xen_xm.c
View File

@ -1151,38 +1151,25 @@ xenParseXMEmulatedDevices(virConfPtr conf, virDomainDefPtr def)
} }
/* static int
* Turn a config record into a lump of XML describing the xenParseXMGeneralMeta(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps)
* domain, suitable for later feeding for virDomainCreateXML
*/
virDomainDefPtr
xenParseXM(virConfPtr conf, int xendConfigVersion,
virCapsPtr caps)
{ {
const char *defaultMachine;
const char *str; const char *str;
int hvm = 0; int hvm = 0;
virDomainDefPtr def = NULL;
size_t i;
const char *defaultMachine;
if (VIR_ALLOC(def) < 0)
return NULL;
def->virtType = VIR_DOMAIN_VIRT_XEN;
def->id = -1;
if (xenXMConfigCopyString(conf, "name", &def->name) < 0) if (xenXMConfigCopyString(conf, "name", &def->name) < 0)
goto cleanup; return -1;
if (xenXMConfigGetUUID(conf, "uuid", def->uuid) < 0)
goto cleanup;
if (xenXMConfigGetUUID(conf, "uuid", def->uuid) < 0)
return -1;
if ((xenXMConfigGetString(conf, "builder", &str, "linux") == 0) && if ((xenXMConfigGetString(conf, "builder", &str, "linux") == 0) &&
STREQ(str, "hvm")) STREQ(str, "hvm"))
hvm = 1; hvm = 1;
if (VIR_STRDUP(def->os.type, hvm ? "hvm" : "xen") < 0) if (VIR_STRDUP(def->os.type, hvm ? "hvm" : "xen") < 0)
goto cleanup; return -1;
def->os.arch = def->os.arch =
virCapabilitiesDefaultGuestArch(caps, virCapabilitiesDefaultGuestArch(caps,
@ -1192,7 +1179,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("no supported architecture for os type '%s'"), _("no supported architecture for os type '%s'"),
def->os.type); def->os.type);
goto cleanup; return -1;
} }
defaultMachine = virCapabilitiesDefaultGuestMachine(caps, defaultMachine = virCapabilitiesDefaultGuestMachine(caps,
@ -1201,10 +1188,34 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
virDomainVirtTypeToString(def->virtType)); virDomainVirtTypeToString(def->virtType));
if (defaultMachine != NULL) { if (defaultMachine != NULL) {
if (VIR_STRDUP(def->os.machine, defaultMachine) < 0) if (VIR_STRDUP(def->os.machine, defaultMachine) < 0)
goto cleanup; return -1;
} }
if (hvm) { 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,
virCapsPtr caps)
{
virDomainDefPtr def = NULL;
size_t i;
if (VIR_ALLOC(def) < 0)
return NULL;
def->virtType = VIR_DOMAIN_VIRT_XEN;
def->id = -1;
if (xenParseXMGeneralMeta(conf, def, caps) < 0)
goto cleanup;
if (STREQ(def->os.type, "hvm")) {
const char *boot; const char *boot;
if (xenXMConfigCopyString(conf, "kernel", &def->os.loader) < 0) if (xenXMConfigCopyString(conf, "kernel", &def->os.loader) < 0)
goto cleanup; goto cleanup;