External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-04 10:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to VIR_STRDUP and VIR_STRNDUP in src/xen/*

Browse Source
This commit is contained in:
Michal Privoznik 2013-05-03 14:51:25 +02:00
parent ed2193b16b
commit 5162a07651
7 changed files with 57 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xen/block_stats.c
View File

@ -292,15 +292,15 @@ xenLinuxDomainDeviceID(int domid, const char *path)
* /sys/devices/xen-backend/(vbd|tap)-{domid}-{devid}/statistics/{...} * /sys/devices/xen-backend/(vbd|tap)-{domid}-{devid}/statistics/{...}
*/ */
if (strlen(path) >= 5 && STRPREFIX(path, "/dev/")) if (strlen(path) >= 5 && STRPREFIX(path, "/dev/")) {
mod_path = strdup(path); if (VIR_STRDUP(mod_path, path) < 0)
else return -1;
ignore_value(virAsprintf(&mod_path, "/dev/%s", path)); } else {
if (virAsprintf(&mod_path, "/dev/%s", path) < 0) {
if (!mod_path) {
virReportOOMError(); virReportOOMError();
return -1; return -1;
} }
}
retval = -1; retval = -1;

9
src/xen/xen_driver.c
View File

@ -469,10 +469,8 @@ xenUnifiedConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int f
priv->opened[XEN_UNIFIED_INOTIFY_OFFSET] = 1; priv->opened[XEN_UNIFIED_INOTIFY_OFFSET] = 1;
#endif #endif
if (!(priv->saveDir = strdup(XEN_SAVE_DIR))) { if (VIR_STRDUP(priv->saveDir, XEN_SAVE_DIR) < 0)
virReportOOMError();
goto error; goto error;
}
if (virFileMakePath(priv->saveDir) < 0) { if (virFileMakePath(priv->saveDir) < 0) {
VIR_ERROR(_("Errored to create save dir '%s': %s"), priv->saveDir, VIR_ERROR(_("Errored to create save dir '%s': %s"), priv->saveDir,
@ -2586,8 +2584,8 @@ xenUnifiedAddDomainInfo(xenUnifiedDomainInfoListPtr list,
if (VIR_ALLOC(info) < 0) if (VIR_ALLOC(info) < 0)
goto memory_error; goto memory_error;
if (!(info->name = strdup(name))) if (VIR_STRDUP(info->name, name) < 0)
goto memory_error; goto error;
memcpy(info->uuid, uuid, VIR_UUID_BUFLEN); memcpy(info->uuid, uuid, VIR_UUID_BUFLEN);
info->id = id; info->id = id;
@ -2603,6 +2601,7 @@ xenUnifiedAddDomainInfo(xenUnifiedDomainInfoListPtr list,
return 0; return 0;
memory_error: memory_error:
virReportOOMError(); virReportOOMError();
error:
if (info) if (info)
VIR_FREE(info->name); VIR_FREE(info->name);
VIR_FREE(info); VIR_FREE(info);

19
src/xen/xen_hypervisor.c
View File

@ -1142,16 +1142,12 @@ xenHypervisorGetSchedulerType(virConnectPtr conn,
switch (op.u.getschedulerid.sched_id){ switch (op.u.getschedulerid.sched_id){
case XEN_SCHEDULER_SEDF: case XEN_SCHEDULER_SEDF:
schedulertype = strdup("sedf"); ignore_value(VIR_STRDUP(schedulertype, "sedf"));
if (schedulertype == NULL)
virReportOOMError();
if (nparams) if (nparams)
*nparams = XEN_SCHED_SEDF_NPARAM; *nparams = XEN_SCHED_SEDF_NPARAM;
break; break;
case XEN_SCHEDULER_CREDIT: case XEN_SCHEDULER_CREDIT:
schedulertype = strdup("credit"); ignore_value(VIR_STRDUP(schedulertype, "credit"));
if (schedulertype == NULL)
virReportOOMError();
if (nparams) if (nparams)
*nparams = XEN_SCHED_CRED_NPARAM; *nparams = XEN_SCHED_CRED_NPARAM;
break; break;
@ -2541,14 +2537,9 @@ xenHypervisorDomainGetOSType(virConnectPtr conn,
return NULL; return NULL;
} }
if (XEN_GETDOMAININFO_FLAGS(dominfo) & DOMFLAGS_HVM) ignore_value(VIR_STRDUP(ostype,
ostype = strdup("hvm"); XEN_GETDOMAININFO_FLAGS(dominfo) & DOMFLAGS_HVM ?
else "hvm" : "linux"));
ostype = strdup("linux");
if (ostype == NULL)
virReportOOMError();
return ostype; return ostype;
} }

15
src/xen/xen_inotify.c
View File

@ -39,7 +39,7 @@
#include "virlog.h" #include "virlog.h"
#include "viruuid.h" #include "viruuid.h"
#include "virfile.h" #include "virfile.h"
#include "virstring.h"
#include "xm_internal.h" /* for xenXMDomainConfigParse */ #include "xm_internal.h" /* for xenXMDomainConfigParse */
#define VIR_FROM_THIS VIR_FROM_XEN_INOTIFY #define VIR_FROM_THIS VIR_FROM_XEN_INOTIFY
@ -58,12 +58,9 @@ xenInotifyXenCacheLookup(virConnectPtr conn,
return -1; return -1;
} }
*name = strdup(entry->def->name);
memcpy(uuid, entry->def->uuid, VIR_UUID_BUFLEN); memcpy(uuid, entry->def->uuid, VIR_UUID_BUFLEN);
if (VIR_STRDUP(*name, entry->def->name) < 0) {
if (!*name) {
VIR_DEBUG("Error getting dom from def"); VIR_DEBUG("Error getting dom from def");
virReportOOMError();
return -1; return -1;
} }
return 0; return 0;
@ -103,11 +100,8 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn,
list info */ list info */
for (i = 0; i < priv->configInfoList->count; i++) { for (i = 0; i < priv->configInfoList->count; i++) {
if (!memcmp(rawuuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN)) { if (!memcmp(rawuuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN)) {
*name = strdup(priv->configInfoList->doms[i]->name); if (VIR_STRDUP(*name, priv->configInfoList->doms[i]->name) < 0)
if (!*name) {
virReportOOMError();
return -1; return -1;
}
memcpy(uuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN); memcpy(uuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN);
VIR_DEBUG("Found dom on list"); VIR_DEBUG("Found dom on list");
return 0; return 0;
@ -118,8 +112,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn,
return -1; return -1;
} }
if (!(*name = strdup(def->name))) { if (VIR_STRDUP(*name, def->name) < 0) {
virReportOOMError();
virDomainDefFree(def); virDomainDefFree(def);
return -1; return -1;
} }

66
src/xen/xend_internal.c
View File

@ -772,8 +772,7 @@ xenDaemonListDomainsOld(virConnectPtr xend)
_for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) { _for_i = _for_i->u.s.cdr, node = _for_i->u.s.car) {
if (node->kind != SEXPR_VALUE) if (node->kind != SEXPR_VALUE)
continue; continue;
ret[i] = strdup(node->u.value); if (VIR_STRDUP(ret[i], node->u.value) < 0)
if (!ret[i])
goto no_memory; goto no_memory;
i++; i++;
} }
@ -1396,14 +1395,8 @@ xenDaemonDomainGetOSType(virConnectPtr conn,
if (root == NULL) if (root == NULL)
return NULL; return NULL;
if (sexpr_lookup(root, "domain/image/hvm")) { ignore_value(VIR_STRDUP(type,
type = strdup("hvm"); sexpr_lookup(root, "domain/image/hvm") ? "hvm" : "linux"));
} else {
type = strdup("linux");
}
if (type == NULL)
virReportOOMError();
sexpr_free(root); sexpr_free(root);
@ -2118,12 +2111,7 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
else else
id = -1; id = -1;
if (domname) { ignore_value(VIR_STRDUP(name, domname));
name = strdup(domname);
if (name == NULL)
virReportOOMError();
}
sexpr_free(root); sexpr_free(root);
} }
@ -2284,12 +2272,9 @@ xenDaemonAttachDeviceFlags(virConnectPtr conn,
priv->xendConfigVersion, 1) < 0) priv->xendConfigVersion, 1) < 0)
goto cleanup; goto cleanup;
if (dev->data.disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) { if (dev->data.disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM &&
if (!(target = strdup(dev->data.disk->dst))) { VIR_STRDUP(target, dev->data.disk->dst) < 0)
virReportOOMError();
goto cleanup; goto cleanup;
}
}
break; break;
case VIR_DOMAIN_DEVICE_NET: case VIR_DOMAIN_DEVICE_NET:
@ -2303,10 +2288,8 @@ xenDaemonAttachDeviceFlags(virConnectPtr conn,
char macStr[VIR_MAC_STRING_BUFLEN]; char macStr[VIR_MAC_STRING_BUFLEN];
virMacAddrFormat(&dev->data.net->mac, macStr); virMacAddrFormat(&dev->data.net->mac, macStr);
if (!(target = strdup(macStr))) { if (VIR_STRDUP(target, macStr) < 0)
virReportOOMError();
goto cleanup; goto cleanup;
}
break; break;
case VIR_DOMAIN_DEVICE_HOSTDEV: case VIR_DOMAIN_DEVICE_HOSTDEV:
@ -2618,12 +2601,9 @@ xenDaemonDomainSetAutostart(virConnectPtr conn,
/* Change the autostart value in place, then define the new sexpr */ /* Change the autostart value in place, then define the new sexpr */
VIR_FREE(autonode->u.s.car->u.value); VIR_FREE(autonode->u.s.car->u.value);
autonode->u.s.car->u.value = (autostart ? strdup("start") if (VIR_STRDUP(autonode->u.s.car->u.value,
: strdup("ignore")); autostart ? "start" : "ignore") < 0)
if (!(autonode->u.s.car->u.value)) {
virReportOOMError();
goto error; goto error;
}
if (sexpr2string(root, &buffer) < 0) { if (sexpr2string(root, &buffer) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -2783,9 +2763,7 @@ xenDaemonDomainMigratePerform(virConnectPtr conn,
virURIFree(uriptr); virURIFree(uriptr);
return -1; return -1;
} }
hostname = strdup(uriptr->server); if (VIR_STRDUP(hostname, uriptr->server) < 0) {
if (!hostname) {
virReportOOMError();
virURIFree(uriptr); virURIFree(uriptr);
return -1; return -1;
} }
@ -2805,20 +2783,14 @@ xenDaemonDomainMigratePerform(virConnectPtr conn,
/* Get the hostname. */ /* Get the hostname. */
n = p - uri; /* n = Length of hostname in bytes. */ n = p - uri; /* n = Length of hostname in bytes. */
hostname = strdup(uri); if (VIR_STRDUP(hostname, uri) < 0)
if (!hostname) {
virReportOOMError();
return -1; return -1;
}
hostname[n] = '\0'; hostname[n] = '\0';
} }
else { /* "hostname" (or IP address) */ else { /* "hostname" (or IP address) */
hostname = strdup(uri); if (VIR_STRDUP(hostname, uri) < 0)
if (!hostname) {
virReportOOMError();
return -1; return -1;
} }
}
VIR_DEBUG("hostname = %s, port = %s", hostname, port); VIR_DEBUG("hostname = %s, port = %s", hostname, port);
@ -2957,10 +2929,8 @@ xenDaemonListDefinedDomains(virConnectPtr conn,
if (node->kind != SEXPR_VALUE) if (node->kind != SEXPR_VALUE)
continue; continue;
if ((names[ret++] = strdup(node->u.value)) == NULL) { if (VIR_STRDUP(names[ret++], node->u.value) < 0)
virReportOOMError();
goto error; goto error;
}
if (ret >= maxnames) if (ret >= maxnames)
break; break;
@ -3017,19 +2987,13 @@ xenDaemonGetSchedulerType(virConnectPtr conn,
goto error; goto error;
} }
if (STREQ(ret, "credit")) { if (STREQ(ret, "credit")) {
schedulertype = strdup("credit"); if (VIR_STRDUP(schedulertype, "credit") < 0)
if (schedulertype == NULL){
virReportOOMError();
goto error; goto error;
}
if (nparams) if (nparams)
*nparams = XEN_SCHED_CRED_NPARAM; *nparams = XEN_SCHED_CRED_NPARAM;
} else if (STREQ(ret, "sedf")) { } else if (STREQ(ret, "sedf")) {
schedulertype = strdup("sedf"); if (VIR_STRDUP(schedulertype, "sedf") < 0)
if (schedulertype == NULL){
virReportOOMError();
goto error; goto error;
}
if (nparams) if (nparams)
*nparams = XEN_SCHED_SEDF_NPARAM; *nparams = XEN_SCHED_SEDF_NPARAM;
} else { } else {

11
src/xen/xm_internal.c
View File

@ -241,8 +241,7 @@ xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename)
virReportOOMError(); virReportOOMError();
return -1; return -1;
} }
if ((entry->filename = strdup(filename)) == NULL) { if (VIR_STRDUP(entry->filename, filename) < 0) {
virReportOOMError();
VIR_FREE(entry); VIR_FREE(entry);
return -1; return -1;
} }
@ -1042,10 +1041,8 @@ xenXMDomainDefineXML(virConnectPtr conn, virDomainDefPtr def)
goto error; goto error;
} }
if ((entry->filename = strdup(filename)) == NULL) { if (VIR_STRDUP(entry->filename, filename) < 0)
virReportOOMError();
goto error; goto error;
}
entry->def = def; entry->def = def;
if (virHashAddEntry(priv->configCache, filename, entry) < 0) { if (virHashAddEntry(priv->configCache, filename, entry) < 0) {
@ -1134,7 +1131,7 @@ xenXMListIterator(void *payload ATTRIBUTE_UNUSED, const void *name, void *data)
def = xenDaemonLookupByName(ctx->conn, name); def = xenDaemonLookupByName(ctx->conn, name);
if (!def) { if (!def) {
if (!(ctx->names[ctx->count] = strdup(name))) if (VIR_STRDUP(ctx->names[ctx->count], name) < 0)
ctx->oom = 1; ctx->oom = 1;
else else
ctx->count++; ctx->count++;
@ -1174,8 +1171,6 @@ xenXMListDefinedDomains(virConnectPtr conn, char **const names, int maxnames)
if (ctx.oom) { if (ctx.oom) {
for (i = 0; i < ctx.count; i++) for (i = 0; i < ctx.count; i++)
VIR_FREE(ctx.names[i]); VIR_FREE(ctx.names[i]);
virReportOOMError();
goto cleanup; goto cleanup;
} }

42
src/xen/xs_internal.c
View File

@ -50,6 +50,7 @@
#include "xen_driver.h" #include "xen_driver.h"
#include "xs_internal.h" #include "xs_internal.h"
#include "xen_hypervisor.h" #include "xen_hypervisor.h"
#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_XEN #define VIR_FROM_THIS VIR_FROM_XEN
@ -428,11 +429,7 @@ xenStoreDomainGetNetworkID(virConnectPtr conn, int id, const char *mac)
VIR_FREE(val); VIR_FREE(val);
if (match) { if (match) {
ret = strdup(list[i]); ignore_value(VIR_STRDUP(ret, list[i]));
if (ret == NULL)
virReportOOMError();
break; break;
} }
} }
@ -481,10 +478,7 @@ xenStoreDomainGetDiskID(virConnectPtr conn, int id, const char *dev)
if ((devlen != len) || memcmp(val, dev, len)) { if ((devlen != len) || memcmp(val, dev, len)) {
VIR_FREE(val); VIR_FREE(val);
} else { } else {
ret = strdup(list[i]); ignore_value(VIR_STRDUP(ret, list[i]));
if (ret == NULL)
virReportOOMError();
VIR_FREE(val); VIR_FREE(val);
VIR_FREE(list); VIR_FREE(list);
@ -504,10 +498,7 @@ xenStoreDomainGetDiskID(virConnectPtr conn, int id, const char *dev)
if ((devlen != len) || memcmp(val, dev, len)) { if ((devlen != len) || memcmp(val, dev, len)) {
VIR_FREE(val); VIR_FREE(val);
} else { } else {
ret = strdup(list[i]); ignore_value(VIR_STRDUP(ret, list[i]));
if (ret == NULL)
virReportOOMError();
VIR_FREE(val); VIR_FREE(val);
VIR_FREE(list); VIR_FREE(list);
@ -559,7 +550,7 @@ xenStoreDomainGetPCIID(virConnectPtr conn, int id, const char *bdf)
VIR_FREE(val); VIR_FREE(val);
if (match) { if (match) {
ret = strdup(list[i]); ignore_value(VIR_STRDUP(ret, list[i]));
break; break;
} }
} }
@ -665,22 +656,22 @@ xenStoreAddWatch(virConnectPtr conn,
} }
} }
if (VIR_ALLOC(watch) < 0) if (VIR_ALLOC(watch) < 0) {
goto no_memory; virReportOOMError();
goto error;
}
watch->path = strdup(path);
watch->token = strdup(token);
watch->cb = cb; watch->cb = cb;
watch->opaque = opaque; watch->opaque = opaque;
if (VIR_STRDUP(watch->path, path) < 0 ||
if (watch->path == NULL || watch->token == NULL) { VIR_STRDUP(watch->token, token) < 0)
goto no_memory; goto error;
}
/* Make space on list */ /* Make space on list */
n = list->count; n = list->count;
if (VIR_REALLOC_N(list->watches, n + 1) < 0) { if (VIR_REALLOC_N(list->watches, n + 1) < 0) {
goto no_memory; virReportOOMError();
goto error;
} }
list->watches[n] = watch; list->watches[n] = watch;
@ -688,15 +679,12 @@ xenStoreAddWatch(virConnectPtr conn,
return xs_watch(priv->xshandle, watch->path, watch->token); return xs_watch(priv->xshandle, watch->path, watch->token);
no_memory: error:
if (watch) { if (watch) {
VIR_FREE(watch->path); VIR_FREE(watch->path);
VIR_FREE(watch->token); VIR_FREE(watch->token);
VIR_FREE(watch); VIR_FREE(watch);
} }
virReportOOMError();
return -1; return -1;
} }