External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 23:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen_common: Change xenConfigGetUUID to use virConfGetValueString

Browse Source 
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2018-09-20 15:28:48 +02:00 committed by John Ferlan
parent db343ca830
commit 93c6239f21
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/xenconfig/xen_common.c
View File

@ -183,7 +183,8 @@ xenConfigCopyStringOpt(virConfPtr conf, const char *name, char **value)
static int static int
xenConfigGetUUID(virConfPtr conf, const char *name, unsigned char *uuid) xenConfigGetUUID(virConfPtr conf, const char *name, unsigned char *uuid)
{ {
virConfValuePtr val; VIR_AUTOFREE(char *) string = NULL;
int rc;
if (!uuid || !name || !conf) { if (!uuid || !name || !conf) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
@ -191,7 +192,11 @@ xenConfigGetUUID(virConfPtr conf, const char *name, unsigned char *uuid)
return -1; return -1;
} }
if (!(val = virConfGetValue(conf, name))) {
if ((rc = virConfGetValueString(conf, name, &string)) < 0)
return -1;
if (rc == 0) {
if (virUUIDGenerate(uuid) < 0) { if (virUUIDGenerate(uuid) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Failed to generate UUID")); "%s", _("Failed to generate UUID"));
@ -201,21 +206,15 @@ xenConfigGetUUID(virConfPtr conf, const char *name, unsigned char *uuid)
} }
} }
if (val->type != VIR_CONF_STRING) { if (!string) {
virReportError(VIR_ERR_CONF_SYNTAX,
_("config value %s not a string"), name);
return -1;
}
if (!val->str) {
virReportError(VIR_ERR_CONF_SYNTAX, virReportError(VIR_ERR_CONF_SYNTAX,
_("%s can't be empty"), name); _("%s can't be empty"), name);
return -1; return -1;
} }
if (virUUIDParse(val->str, uuid) < 0) { if (virUUIDParse(string, uuid) < 0) {
virReportError(VIR_ERR_CONF_SYNTAX, virReportError(VIR_ERR_CONF_SYNTAX,
_("%s not parseable"), val->str); _("%s not parseable"), string);
return -1; return -1;
} }