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

Adapt to VIR_STRDUP and VIR_STRNDUP in src/vmx/*

Browse Source
This commit is contained in:
Michal Privoznik 2013-05-03 14:51:02 +02:00
parent e6ab100980
commit ab2a3d01e5
1 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/vmx/vmx.c
View File

@ -682,14 +682,7 @@ virVMXGetConfigString(virConfPtr conf, const char *name, char **string,
return -1; return -1;
} }
*string = strdup(value->str); return VIR_STRDUP(*string, value->str);
if (*string == NULL) {
virReportOOMError();
return -1;
}
return 0;
} }
@ -1526,12 +1519,8 @@ virVMXParseConfig(virVMXContext *ctx,
def->onCrash = VIR_DOMAIN_LIFECYCLE_DESTROY; def->onCrash = VIR_DOMAIN_LIFECYCLE_DESTROY;
/* def:os */ /* def:os */
def->os.type = strdup("hvm"); if (VIR_STRDUP(def->os.type, "hvm") < 0)
if (def->os.type == NULL) {
virReportOOMError();
goto cleanup; goto cleanup;
}
/* vmx:guestOS -> def:os.arch */ /* vmx:guestOS -> def:os.arch */
if (virVMXGetConfigString(conf, "guestOS", &guestOS, true) < 0) { if (virVMXGetConfigString(conf, "guestOS", &guestOS, true) < 0) {
@ -2579,12 +2568,8 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
if (STRCASEEQ(virtualDev, "vmxnet") && features == 15) { if (STRCASEEQ(virtualDev, "vmxnet") && features == 15) {
VIR_FREE(virtualDev); VIR_FREE(virtualDev);
virtualDev = strdup("vmxnet2"); if (VIR_STRDUP(virtualDev, "vmxnet2") < 0)
if (virtualDev == NULL) {
virReportOOMError();
goto cleanup; goto cleanup;
}
} }
} }
@ -2596,13 +2581,8 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
true) < 0) true) < 0)
goto cleanup; goto cleanup;
if (networkName == NULL) { if (!networkName && VIR_STRDUP(networkName, "") < 0)
networkName = strdup(""); goto cleanup;
if (networkName == NULL) {
virReportOOMError();
goto cleanup;
}
}
} }
/* vmx:vnet -> def:data.ifname */ /* vmx:vnet -> def:data.ifname */
@ -2797,12 +2777,8 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port,
goto cleanup; goto cleanup;
} }
(*def)->source.data.tcp.host = strdup(parsedUri->server); if (VIR_STRDUP((*def)->source.data.tcp.host, parsedUri->server) < 0)
if ((*def)->source.data.tcp.host == NULL) {
virReportOOMError();
goto cleanup; goto cleanup;
}
if (virAsprintf(&(*def)->source.data.tcp.service, "%d", if (virAsprintf(&(*def)->source.data.tcp.service, "%d",
parsedUri->port) < 0) { parsedUri->port) < 0) {