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

qemu: domain: use g_new0

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Ján Tomko 2020-10-05 12:26:10 +02:00
parent f655a603dd
commit 0ac810b225
1 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/qemu/qemu_domain.c
View File

@ -496,8 +496,7 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivatePtr priv)
goto error; goto error;
} }
if (VIR_ALLOC_N(masterKey, 1024) < 0) masterKey = g_new0(uint8_t, 1024);
goto error;
if ((masterKeyLen = saferead(fd, masterKey, 1024)) < 0) { if ((masterKeyLen = saferead(fd, masterKey, 1024)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -572,8 +571,7 @@ qemuDomainMasterKeyCreate(virDomainObjPtr vm)
if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET)) if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET))
return 0; return 0;
if (VIR_ALLOC_N(priv->masterKey, QEMU_DOMAIN_MASTER_KEY_LEN) < 0) priv->masterKey = g_new0(uint8_t, QEMU_DOMAIN_MASTER_KEY_LEN);
return -1;
priv->masterKeyLen = QEMU_DOMAIN_MASTER_KEY_LEN; priv->masterKeyLen = QEMU_DOMAIN_MASTER_KEY_LEN;
if (virRandomBytes(priv->masterKey, priv->masterKeyLen) < 0) { if (virRandomBytes(priv->masterKey, priv->masterKeyLen) < 0) {
@ -1188,8 +1186,7 @@ qemuDomainSecretInfoNewPlain(virSecretUsageType usageType,
{ {
qemuDomainSecretInfoPtr secinfo = NULL; qemuDomainSecretInfoPtr secinfo = NULL;
if (VIR_ALLOC(secinfo) < 0) secinfo = g_new0(qemuDomainSecretInfo, 1);
return NULL;
if (qemuDomainSecretPlainSetup(secinfo, usageType, username, lookupDef) < 0) { if (qemuDomainSecretPlainSetup(secinfo, usageType, username, lookupDef) < 0) {
g_clear_pointer(&secinfo, qemuDomainSecretInfoFree); g_clear_pointer(&secinfo, qemuDomainSecretInfoFree);
@ -1689,8 +1686,7 @@ qemuDomainObjPrivateAlloc(void *opaque)
{ {
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
if (VIR_ALLOC(priv) < 0) priv = g_new0(qemuDomainObjPrivate, 1);
return NULL;
if (qemuDomainObjInitJob(&priv->job, &qemuPrivateJobCallbacks) < 0) { if (qemuDomainObjInitJob(&priv->job, &qemuPrivateJobCallbacks) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
@ -1845,9 +1841,7 @@ qemuStorageSourcePrivateDataAssignSecinfo(qemuDomainSecretInfoPtr *secinfo,
return 0; return 0;
if (!*secinfo) { if (!*secinfo) {
if (VIR_ALLOC(*secinfo) < 0) *secinfo = g_new0(qemuDomainSecretInfo, 1);
return -1;
(*secinfo)->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES; (*secinfo)->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES;
} }
@ -3083,8 +3077,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
} }
if (n > 0) { if (n > 0) {
/* NULL-terminated list */ /* NULL-terminated list */
if (VIR_ALLOC_N(priv->qemuDevices, n + 1) < 0) priv->qemuDevices = g_new0(char *, n + 1);
goto error;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
priv->qemuDevices[i] = virXMLPropString(nodes[i], "alias"); priv->qemuDevices[i] = virXMLPropString(nodes[i], "alias");
@ -3245,8 +3238,7 @@ qemuDomainDefNamespaceParseCommandlineArgs(qemuDomainXmlNsDefPtr nsdef,
if (nnodes == 0) if (nnodes == 0)
return 0; return 0;
if (VIR_ALLOC_N(nsdef->args, nnodes) < 0) nsdef->args = g_new0(char *, nnodes);
return -1;
for (i = 0; i < nnodes; i++) { for (i = 0; i < nnodes; i++) {
if (!(nsdef->args[nsdef->num_args++] = virXMLPropString(nodes[i], "value"))) { if (!(nsdef->args[nsdef->num_args++] = virXMLPropString(nodes[i], "value"))) {
@ -3293,9 +3285,8 @@ qemuDomainDefNamespaceParseCommandlineEnv(qemuDomainXmlNsDefPtr nsdef,
if (nnodes == 0) if (nnodes == 0)
return 0; return 0;
if (VIR_ALLOC_N(nsdef->env_name, nnodes) < 0 || nsdef->env_name = g_new0(char *, nnodes);
VIR_ALLOC_N(nsdef->env_value, nnodes) < 0) nsdef->env_value = g_new0(char *, nnodes);
return -1;
for (i = 0; i < nnodes; i++) { for (i = 0; i < nnodes; i++) {
if (!(nsdef->env_name[nsdef->num_env] = virXMLPropString(nodes[i], "name"))) { if (!(nsdef->env_name[nsdef->num_env] = virXMLPropString(nodes[i], "name"))) {
@ -3331,8 +3322,7 @@ qemuDomainDefNamespaceParseCaps(qemuDomainXmlNsDefPtr nsdef,
return -1; return -1;
if (nnodesadd > 0) { if (nnodesadd > 0) {
if (VIR_ALLOC_N(nsdef->capsadd, nnodesadd) < 0) nsdef->capsadd = g_new0(char *, nnodesadd);
return -1;
for (i = 0; i < nnodesadd; i++) { for (i = 0; i < nnodesadd; i++) {
if (!(nsdef->capsadd[nsdef->ncapsadd++] = virXMLPropString(nodesadd[i], "capability"))) { if (!(nsdef->capsadd[nsdef->ncapsadd++] = virXMLPropString(nodesadd[i], "capability"))) {
@ -3344,8 +3334,7 @@ qemuDomainDefNamespaceParseCaps(qemuDomainXmlNsDefPtr nsdef,
} }
if (nnodesdel > 0) { if (nnodesdel > 0) {
if (VIR_ALLOC_N(nsdef->capsdel, nnodesdel) < 0) nsdef->capsdel = g_new0(char *, nnodesdel);
return -1;
for (i = 0; i < nnodesdel; i++) { for (i = 0; i < nnodesdel; i++) {
if (!(nsdef->capsdel[nsdef->ncapsdel++] = virXMLPropString(nodesdel[i], "capability"))) { if (!(nsdef->capsdel[nsdef->ncapsdel++] = virXMLPropString(nodesdel[i], "capability"))) {
@ -3367,8 +3356,7 @@ qemuDomainDefNamespaceParse(xmlXPathContextPtr ctxt,
qemuDomainXmlNsDefPtr nsdata = NULL; qemuDomainXmlNsDefPtr nsdata = NULL;
int ret = -1; int ret = -1;
if (VIR_ALLOC(nsdata) < 0) nsdata = g_new0(qemuDomainXmlNsDef, 1);
return -1;
if (qemuDomainDefNamespaceParseCommandlineArgs(nsdata, ctxt) < 0 || if (qemuDomainDefNamespaceParseCommandlineArgs(nsdata, ctxt) < 0 ||
qemuDomainDefNamespaceParseCommandlineEnv(nsdata, ctxt) < 0 || qemuDomainDefNamespaceParseCommandlineEnv(nsdata, ctxt) < 0 ||
@ -3661,8 +3649,7 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
if (addDefaultMemballoon && !def->memballoon) { if (addDefaultMemballoon && !def->memballoon) {
virDomainMemballoonDefPtr memballoon; virDomainMemballoonDefPtr memballoon;
if (VIR_ALLOC(memballoon) < 0) memballoon = g_new0(virDomainMemballoonDef, 1);
return -1;
memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO; memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO;
def->memballoon = memballoon; def->memballoon = memballoon;
@ -3718,9 +3705,7 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
} }
if (j == def->npanics) { if (j == def->npanics) {
virDomainPanicDefPtr panic; virDomainPanicDefPtr panic = g_new0(virDomainPanicDef, 1);
if (VIR_ALLOC(panic) < 0)
return -1;
if (VIR_APPEND_ELEMENT_COPY(def->panics, if (VIR_APPEND_ELEMENT_COPY(def->panics,
def->npanics, panic) < 0) { def->npanics, panic) < 0) {
@ -5911,12 +5896,9 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver,
virDomainControllerDefPtr *controllers = def->controllers; virDomainControllerDefPtr *controllers = def->controllers;
int ncontrollers = def->ncontrollers; int ncontrollers = def->ncontrollers;
if (VIR_ALLOC_N(def->controllers, ncontrollers - toremove) < 0) { def->controllers = g_new0(virDomainControllerDefPtr, ncontrollers - toremove);
def->controllers = controllers;
goto cleanup;
}
def->ncontrollers = 0; def->ncontrollers = 0;
for (i = 0; i < ncontrollers; i++) { for (i = 0; i < ncontrollers; i++) {
if (controllers[i] != usb && controllers[i] != pci) if (controllers[i] != usb && controllers[i] != pci)
def->controllers[def->ncontrollers++] = controllers[i]; def->controllers[def->ncontrollers++] = controllers[i];
@ -6350,8 +6332,7 @@ ssize_t qemuDomainLogContextRead(qemuDomainLogContextPtr ctxt,
/* Best effort jump to start of messages */ /* Best effort jump to start of messages */
ignore_value(lseek(ctxt->readfd, ctxt->pos, SEEK_SET)); ignore_value(lseek(ctxt->readfd, ctxt->pos, SEEK_SET));
if (VIR_ALLOC_N(buf, buflen) < 0) buf = g_new0(char, buflen);
return -1;
got = saferead(ctxt->readfd, buf, buflen - 1); got = saferead(ctxt->readfd, buf, buflen - 1);
if (got < 0) { if (got < 0) {