From nobody Sun Feb 8 19:21:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601894251; cv=none; d=zohomail.com; s=zohoarc; b=U/D4Cc/SG2+XnhDa3kE+aWtf7Ayqvs00cL2XqUoM846KKbaq3j79N0IopmhWYEKj8ZG6aiAJHo6c/O9E2b+rZnOP92/GWm74T1UVAMWe+w4RBld9ootDwlXaJAkjukWJWoHYT5Am176hlNZcvy5p9TEt4IJymwFJqEYiHB+kFfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601894251; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JAkZUrlnsF5+VbETyk+j0XnnOSFPLklFl7BeaRTtwdo=; b=cXiL14gdpQK267RDQbH4XXrePAO1Cqe2diSaU9zTnYAX8BKFFaW3VaRuFiZVpxdxPEnt21ZFMR7ye+mRK4Lgmb2z7t/qNzkLEuKU5U1FMXnDQ58MPMLXSykB6ZOom9lw0bfAsqYa82/sgth5Fry7PDPQiLGFtN4bQBjxrPgvZMc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601894251839982.2099659675665; Mon, 5 Oct 2020 03:37:31 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-45-2EoY_XN_PTGsKDt35HlAww-1; Mon, 05 Oct 2020 06:37:28 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C7A5F8015C6; Mon, 5 Oct 2020 10:37:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B228A100164C; Mon, 5 Oct 2020 10:37:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7F155181A720; Mon, 5 Oct 2020 10:37:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 095AakU0018889 for ; Mon, 5 Oct 2020 06:36:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 79BD85C1BD; Mon, 5 Oct 2020 10:36:46 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 025BD5C225 for ; Mon, 5 Oct 2020 10:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601894250; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JAkZUrlnsF5+VbETyk+j0XnnOSFPLklFl7BeaRTtwdo=; b=UnoFpDg8mRx5cgPCrMs+TFhhAz0tNnKMFW5+LFi7krV8E5TzPEaeVMnVk0g2ywFaYz5emn JBWdetP40Qtwl9cEHsJ0jJ4vzkrzXecEZJM/uDXt/u0O+rYdLjrx7FwxD6hwjrgKTBzuAg Ytotf3HDUCYWQn5P1DddtzffLQt6lNY= X-MC-Unique: 2EoY_XN_PTGsKDt35HlAww-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/9] qemu: domain: use g_new0 Date: Mon, 5 Oct 2020 12:36:33 +0200 Message-Id: <4c6d9a4f30c788b732644b26a511487a687eacf8.1601894130.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 53 ++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 491fb0ed3d..15912317de 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -496,8 +496,7 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivatePtr pri= v) goto error; } =20 - if (VIR_ALLOC_N(masterKey, 1024) < 0) - goto error; + masterKey =3D g_new0(uint8_t, 1024); =20 if ((masterKeyLen =3D saferead(fd, masterKey, 1024)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -572,8 +571,7 @@ qemuDomainMasterKeyCreate(virDomainObjPtr vm) if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET)) return 0; =20 - if (VIR_ALLOC_N(priv->masterKey, QEMU_DOMAIN_MASTER_KEY_LEN) < 0) - return -1; + priv->masterKey =3D g_new0(uint8_t, QEMU_DOMAIN_MASTER_KEY_LEN); priv->masterKeyLen =3D QEMU_DOMAIN_MASTER_KEY_LEN; =20 if (virRandomBytes(priv->masterKey, priv->masterKeyLen) < 0) { @@ -1188,8 +1186,7 @@ qemuDomainSecretInfoNewPlain(virSecretUsageType usage= Type, { qemuDomainSecretInfoPtr secinfo =3D NULL; =20 - if (VIR_ALLOC(secinfo) < 0) - return NULL; + secinfo =3D g_new0(qemuDomainSecretInfo, 1); =20 if (qemuDomainSecretPlainSetup(secinfo, usageType, username, lookupDef= ) < 0) { g_clear_pointer(&secinfo, qemuDomainSecretInfoFree); @@ -1689,8 +1686,7 @@ qemuDomainObjPrivateAlloc(void *opaque) { qemuDomainObjPrivatePtr priv; =20 - if (VIR_ALLOC(priv) < 0) - return NULL; + priv =3D g_new0(qemuDomainObjPrivate, 1); =20 if (qemuDomainObjInitJob(&priv->job, &qemuPrivateJobCallbacks) < 0) { virReportSystemError(errno, "%s", @@ -1845,9 +1841,7 @@ qemuStorageSourcePrivateDataAssignSecinfo(qemuDomainS= ecretInfoPtr *secinfo, return 0; =20 if (!*secinfo) { - if (VIR_ALLOC(*secinfo) < 0) - return -1; - + *secinfo =3D g_new0(qemuDomainSecretInfo, 1); (*secinfo)->type =3D VIR_DOMAIN_SECRET_INFO_TYPE_AES; } =20 @@ -3083,8 +3077,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, } if (n > 0) { /* NULL-terminated list */ - if (VIR_ALLOC_N(priv->qemuDevices, n + 1) < 0) - goto error; + priv->qemuDevices =3D g_new0(char *, n + 1); =20 for (i =3D 0; i < n; i++) { priv->qemuDevices[i] =3D virXMLPropString(nodes[i], "alias"); @@ -3245,8 +3238,7 @@ qemuDomainDefNamespaceParseCommandlineArgs(qemuDomain= XmlNsDefPtr nsdef, if (nnodes =3D=3D 0) return 0; =20 - if (VIR_ALLOC_N(nsdef->args, nnodes) < 0) - return -1; + nsdef->args =3D g_new0(char *, nnodes); =20 for (i =3D 0; i < nnodes; i++) { if (!(nsdef->args[nsdef->num_args++] =3D virXMLPropString(nodes[i]= , "value"))) { @@ -3293,9 +3285,8 @@ qemuDomainDefNamespaceParseCommandlineEnv(qemuDomainX= mlNsDefPtr nsdef, if (nnodes =3D=3D 0) return 0; =20 - if (VIR_ALLOC_N(nsdef->env_name, nnodes) < 0 || - VIR_ALLOC_N(nsdef->env_value, nnodes) < 0) - return -1; + nsdef->env_name =3D g_new0(char *, nnodes); + nsdef->env_value =3D g_new0(char *, nnodes); =20 for (i =3D 0; i < nnodes; i++) { if (!(nsdef->env_name[nsdef->num_env] =3D virXMLPropString(nodes[i= ], "name"))) { @@ -3331,8 +3322,7 @@ qemuDomainDefNamespaceParseCaps(qemuDomainXmlNsDefPtr= nsdef, return -1; =20 if (nnodesadd > 0) { - if (VIR_ALLOC_N(nsdef->capsadd, nnodesadd) < 0) - return -1; + nsdef->capsadd =3D g_new0(char *, nnodesadd); =20 for (i =3D 0; i < nnodesadd; i++) { if (!(nsdef->capsadd[nsdef->ncapsadd++] =3D virXMLPropString(n= odesadd[i], "capability"))) { @@ -3344,8 +3334,7 @@ qemuDomainDefNamespaceParseCaps(qemuDomainXmlNsDefPtr= nsdef, } =20 if (nnodesdel > 0) { - if (VIR_ALLOC_N(nsdef->capsdel, nnodesdel) < 0) - return -1; + nsdef->capsdel =3D g_new0(char *, nnodesdel); =20 for (i =3D 0; i < nnodesdel; i++) { if (!(nsdef->capsdel[nsdef->ncapsdel++] =3D virXMLPropString(n= odesdel[i], "capability"))) { @@ -3367,8 +3356,7 @@ qemuDomainDefNamespaceParse(xmlXPathContextPtr ctxt, qemuDomainXmlNsDefPtr nsdata =3D NULL; int ret =3D -1; =20 - if (VIR_ALLOC(nsdata) < 0) - return -1; + nsdata =3D g_new0(qemuDomainXmlNsDef, 1); =20 if (qemuDomainDefNamespaceParseCommandlineArgs(nsdata, ctxt) < 0 || qemuDomainDefNamespaceParseCommandlineEnv(nsdata, ctxt) < 0 || @@ -3661,8 +3649,7 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, =20 if (addDefaultMemballoon && !def->memballoon) { virDomainMemballoonDefPtr memballoon; - if (VIR_ALLOC(memballoon) < 0) - return -1; + memballoon =3D g_new0(virDomainMemballoonDef, 1); =20 memballoon->model =3D VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO; def->memballoon =3D memballoon; @@ -3718,9 +3705,7 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, } =20 if (j =3D=3D def->npanics) { - virDomainPanicDefPtr panic; - if (VIR_ALLOC(panic) < 0) - return -1; + virDomainPanicDefPtr panic =3D g_new0(virDomainPanicDef, 1); =20 if (VIR_APPEND_ELEMENT_COPY(def->panics, def->npanics, panic) < 0) { @@ -5911,12 +5896,9 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driv= er, virDomainControllerDefPtr *controllers =3D def->controllers; int ncontrollers =3D def->ncontrollers; =20 - if (VIR_ALLOC_N(def->controllers, ncontrollers - toremove) < 0= ) { - def->controllers =3D controllers; - goto cleanup; - } - + def->controllers =3D g_new0(virDomainControllerDefPtr, ncontro= llers - toremove); def->ncontrollers =3D 0; + for (i =3D 0; i < ncontrollers; i++) { if (controllers[i] !=3D usb && controllers[i] !=3D pci) def->controllers[def->ncontrollers++] =3D controllers[= i]; @@ -6347,8 +6329,7 @@ ssize_t qemuDomainLogContextRead(qemuDomainLogContext= Ptr ctxt, /* Best effort jump to start of messages */ ignore_value(lseek(ctxt->readfd, ctxt->pos, SEEK_SET)); =20 - if (VIR_ALLOC_N(buf, buflen) < 0) - return -1; + buf =3D g_new0(char, buflen); =20 got =3D saferead(ctxt->readfd, buf, buflen - 1); if (got < 0) { --=20 2.26.2