From nobody Sat May 18 08:35:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1672922045; cv=none; d=zohomail.com; s=zohoarc; b=cjMr1rXpiKEoQ6hfYU0zH0g7+HsIQPDSxwgQfkErVhIjU9KxR9NBWiv8HeGBSJM7jxm+ij5cBnNXpArrL4+rX+rGDRZH8oZSdzzLiTyVsANFewAPHxNlzg5cs2iGuxCSq05oEeyOQH8rmPa3NcvTlX2MVvbCeE8Ei22M33G7gz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672922045; h=Content-Type:Content-Transfer-Encoding:Cc: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=BnWGoJNiH0ti99Xdl0Tw3hXi9+aNBg0gGrs75IQpgdY=; b=lfC+X6+f155H7nLu54+sNJ9CeK615EAPsKOdpF8zUpT/Syd9VaNP4OA012lHPkI2vGcOR05qQGkoiZRshdYulSHnUsRY2u5DGJqhQcevepa3U3iMww8WgLGDv5PMk2gw9rL9t0J2WBUp6l04xaOVtkHKeX+fatWdY4c4FOaRsdQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1672922045120971.2738776182094; Thu, 5 Jan 2023 04:34:05 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-172-ANE4j2bpPUe-x9Favp6cWg-1; Thu, 05 Jan 2023 07:33:14 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BC2E83C0D18F; Thu, 5 Jan 2023 12:33:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81DF12166B30; Thu, 5 Jan 2023 12:33:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 642F5194658C; Thu, 5 Jan 2023 12:33:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 558D119465B1 for ; Thu, 5 Jan 2023 12:33:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 49F1553AA; Thu, 5 Jan 2023 12:33:11 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4140853A0 for ; Thu, 5 Jan 2023 12:33:11 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1905F1C008CD for ; Thu, 5 Jan 2023 12:33:11 +0000 (UTC) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-489-5hpMkDQSMY6ge-_8IDTMpA-1; Thu, 05 Jan 2023 07:33:08 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Nnm6q6QKhzRqy0 for ; Thu, 5 Jan 2023 20:31:31 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 5 Jan 2023 20:33:04 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672922043; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=BnWGoJNiH0ti99Xdl0Tw3hXi9+aNBg0gGrs75IQpgdY=; b=E3V6enIoXZly+Qmkjy5RgM+ndZxh/sTbdoHqIi1Q6P8YtjXj7ezFj1BOcOXL9IiDWKRDHm NUq/3UFa1yorSY8bewOyLWUPh7peQ8Q7d6+lWJhhxRs9vgWbfewnd7j+8EtZDE+Vyju7kA ir/YVERNKFUs+usDiyJJB0pwmfW0Zcw= X-MC-Unique: ANE4j2bpPUe-x9Favp6cWg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 5hpMkDQSMY6ge-_8IDTMpA-1 From: Jiang Jiacheng To: Subject: [PATCH 1/9] conf: use g_autofree and remove unnecessary label Date: Thu, 5 Jan 2023 20:26:47 +0800 Message-ID: <20230105122655.3413625-2-jiangjiacheng@huawei.com> In-Reply-To: <20230105122655.3413625-1-jiangjiacheng@huawei.com> References: <20230105122655.3413625-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhengchuan@huawei.com, linyilu@huawei.com, jiangjiacheng@huawei.com, xiexiangyou@huawei.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672922046092100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: Jonathon Jongsma --- src/conf/domain_audit.c | 121 ++++++++++--------------------- src/conf/node_device_util.c | 49 +++++-------- src/conf/nwfilter_conf.c | 51 ++++--------- src/conf/virnetworkobj.c | 85 ++++++++-------------- src/conf/virnetworkportdef.c | 12 +-- src/conf/virnwfilterbindingobj.c | 22 ++---- src/conf/virnwfilterobj.c | 14 +--- src/conf/virstorageobj.c | 23 ++---- 8 files changed, 127 insertions(+), 250 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 82cf6ab749..ae875188bd 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -300,9 +300,9 @@ virDomainAuditNetDevice(virDomainDef *vmDef, virDomainN= etDef *netDef, { char uuidstr[VIR_UUID_STRING_BUFLEN]; char macstr[VIR_MAC_STRING_BUFLEN]; - char *vmname; - char *dev_name =3D NULL; - char *rdev; + g_autofree char *vmname =3D NULL; + g_autofree char *dev_name =3D NULL; + g_autofree char *rdev =3D NULL; const char *virt =3D virDomainAuditGetVirtType(vmDef); =20 virUUIDFormat(vmDef->uuid, uuidstr); @@ -312,17 +312,12 @@ virDomainAuditNetDevice(virDomainDef *vmDef, virDomai= nNetDef *netDef, if (!(vmname =3D virAuditEncode("vm", vmDef->name)) || !(dev_name =3D virAuditEncode("path", device))) { VIR_WARN("OOM while encoding audit message"); - goto cleanup; + return; } =20 VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, "virt=3D%s resrc=3Dnet reason=3Dopen %s uuid=3D%s net=3D%s %= s rdev=3D%s", virt, vmname, uuidstr, macstr, dev_name, VIR_AUDIT_STR(rdev)= ); - - cleanup: - VIR_FREE(vmname); - VIR_FREE(dev_name); - VIR_FREE(rdev); } =20 /** @@ -339,9 +334,9 @@ virDomainAuditHostdev(virDomainObj *vm, virDomainHostde= vDef *hostdev, const char *reason, bool success) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *vmname; - char *address =3D NULL; - char *device =3D NULL; + g_autofree char *vmname =3D NULL; + g_autofree char *address =3D NULL; + g_autofree char *device =3D NULL; const char *virt =3D virDomainAuditGetVirtType(vm->def); =20 virDomainHostdevSubsysUSB *usbsrc =3D &hostdev->source.subsys.u.usb; @@ -371,7 +366,7 @@ virDomainAuditHostdev(virDomainObj *vm, virDomainHostde= vDef *hostdev, /* Follow virDomainAuditDisk && virDomainAuditGenericDev * and don't audit the networked device. */ - goto cleanup; + return; } else { virDomainHostdevSubsysSCSIHost *scsihostsrc =3D &scsisrc->= u.host; =20 @@ -392,12 +387,12 @@ virDomainAuditHostdev(virDomainObj *vm, virDomainHost= devDef *hostdev, default: VIR_WARN("Unexpected hostdev type while encoding audit message= : %d", hostdev->source.subsys.type); - goto cleanup; + return; } =20 if (!(device =3D virAuditEncode("device", VIR_AUDIT_STR(address)))= ) { VIR_WARN("OOM while encoding audit message"); - goto cleanup; + return; } =20 VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, @@ -413,7 +408,7 @@ virDomainAuditHostdev(virDomainObj *vm, virDomainHostde= vDef *hostdev, if (!(device =3D virAuditEncode("disk", VIR_AUDIT_STR(hostdev->source.ca= ps.u.storage.block)))) { VIR_WARN("OOM while encoding audit message"); - goto cleanup; + return; } =20 VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, @@ -425,7 +420,7 @@ virDomainAuditHostdev(virDomainObj *vm, virDomainHostde= vDef *hostdev, if (!(device =3D virAuditEncode("chardev", VIR_AUDIT_STR(hostdev->source.ca= ps.u.misc.chardev)))) { VIR_WARN("OOM while encoding audit message"); - goto cleanup; + return; } =20 VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, @@ -436,7 +431,7 @@ virDomainAuditHostdev(virDomainObj *vm, virDomainHostde= vDef *hostdev, default: VIR_WARN("Unexpected hostdev type while encoding audit message= : %d", hostdev->source.caps.type); - goto cleanup; + return; } break; =20 @@ -444,13 +439,8 @@ virDomainAuditHostdev(virDomainObj *vm, virDomainHostd= evDef *hostdev, default: VIR_WARN("Unexpected hostdev mode while encoding audit message: %d= ", hostdev->mode); - goto cleanup; + return; } - - cleanup: - VIR_FREE(vmname); - VIR_FREE(device); - VIR_FREE(address); } =20 =20 @@ -468,9 +458,9 @@ virDomainAuditRedirdev(virDomainObj *vm, virDomainRedir= devDef *redirdev, const char *reason, bool success) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *vmname; - char *address =3D NULL; - char *device =3D NULL; + g_autofree char *vmname =3D NULL; + g_autofree char *address =3D NULL; + g_autofree char *device =3D NULL; const char *virt =3D virDomainAuditGetVirtType(vm->def); =20 virUUIDFormat(vm->def->uuid, uuidstr); @@ -486,12 +476,12 @@ virDomainAuditRedirdev(virDomainObj *vm, virDomainRed= irdevDef *redirdev, default: VIR_WARN("Unexpected redirdev bus while encoding audit message: %d= ", redirdev->bus); - goto cleanup; + return; } =20 if (!(device =3D virAuditEncode("device", VIR_AUDIT_STR(address)))) { VIR_WARN("OOM while encoding audit message"); - goto cleanup; + return; } =20 VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, @@ -499,11 +489,6 @@ virDomainAuditRedirdev(virDomainObj *vm, virDomainRedi= rdevDef *redirdev, virt, reason, vmname, uuidstr, virDomainRedirdevBusTypeToString(redirdev->bus), device); - - cleanup: - VIR_FREE(vmname); - VIR_FREE(device); - VIR_FREE(address); } =20 =20 @@ -522,9 +507,9 @@ virDomainAuditTPM(virDomainObj *vm, virDomainTPMDef *tp= m, const char *reason, bool success) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *vmname; + g_autofree char *vmname =3D NULL; char *path =3D NULL; - char *device =3D NULL; + g_autofree char *device =3D NULL; const char *virt =3D virDomainAuditGetVirtType(vm->def); =20 virUUIDFormat(vm->def->uuid, uuidstr); @@ -538,7 +523,7 @@ virDomainAuditTPM(virDomainObj *vm, virDomainTPMDef *tp= m, path =3D tpm->data.passthrough.source->data.file.path; if (!(device =3D virAuditEncode("device", VIR_AUDIT_STR(path)))) { VIR_WARN("OOM while encoding audit message"); - goto cleanup; + return; } =20 VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, @@ -549,7 +534,7 @@ virDomainAuditTPM(virDomainObj *vm, virDomainTPMDef *tp= m, path =3D tpm->data.emulator.source->data.nix.path; if (!(device =3D virAuditEncode("device", VIR_AUDIT_STR(path)))) { VIR_WARN("OOM while encoding audit message"); - goto cleanup; + return; } =20 VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, @@ -560,7 +545,7 @@ virDomainAuditTPM(virDomainObj *vm, virDomainTPMDef *tp= m, path =3D tpm->data.external.source->data.nix.path; if (!(device =3D virAuditEncode("device", VIR_AUDIT_STR(path)))) { VIR_WARN("OOM while encoding audit message"); - goto cleanup; + return; } =20 VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, @@ -571,10 +556,6 @@ virDomainAuditTPM(virDomainObj *vm, virDomainTPMDef *t= pm, default: break; } - - cleanup: - VIR_FREE(vmname); - VIR_FREE(device); } =20 =20 @@ -596,9 +577,9 @@ virDomainAuditCgroup(virDomainObj *vm, virCgroup *cgrou= p, const char *reason, const char *extra, bool success) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *vmname; - char *controller =3D NULL; - char *detail; + g_autofree char *vmname =3D NULL; + g_autofree char *controller =3D NULL; + g_autofree char *detail =3D NULL; const char *virt =3D virDomainAuditGetVirtType(vm->def); =20 virUUIDFormat(vm->def->uuid, uuidstr); @@ -616,10 +597,6 @@ virDomainAuditCgroup(virDomainObj *vm, virCgroup *cgro= up, "virt=3D%s resrc=3Dcgroup reason=3D%s %s uuid=3D%s %s class= =3D%s", virt, reason, vmname, uuidstr, detail ? detail : "cgroup=3D?", extra); - - VIR_FREE(vmname); - VIR_FREE(controller); - VIR_FREE(detail); } =20 /** @@ -639,14 +616,12 @@ virDomainAuditCgroupMajor(virDomainObj *vm, virCgroup= *cgroup, const char *reason, int maj, const char *name, const char *perms, bool success) { - char *extra; + g_autofree char *extra =3D NULL; =20 extra =3D g_strdup_printf("major category=3D%s maj=3D%02X acl=3D%s", name, maj, perms); =20 virDomainAuditCgroup(vm, cgroup, reason, extra, success); - - VIR_FREE(extra); } =20 /** @@ -666,9 +641,9 @@ virDomainAuditCgroupPath(virDomainObj *vm, virCgroup *c= group, const char *reason, const char *path, const char = *perms, int rc) { - char *detail; - char *rdev; - char *extra =3D NULL; + g_autofree char *detail =3D NULL; + g_autofree char *rdev =3D NULL; + g_autofree char *extra =3D NULL; =20 /* Nothing to audit for regular files. */ if (rc > 0) @@ -678,18 +653,13 @@ virDomainAuditCgroupPath(virDomainObj *vm, virCgroup = *cgroup, =20 if (!(detail =3D virAuditEncode("path", path))) { VIR_WARN("OOM while encoding audit message"); - goto cleanup; + return; } =20 extra =3D g_strdup_printf("path %s rdev=3D%s acl=3D%s", detail, VIR_AUDIT_STR(rdev), perms); =20 virDomainAuditCgroup(vm, cgroup, reason, extra, rc =3D=3D 0); - - cleanup: - VIR_FREE(extra); - VIR_FREE(detail); - VIR_FREE(rdev); } =20 /** @@ -709,7 +679,7 @@ virDomainAuditResource(virDomainObj *vm, const char *re= source, const char *reason, bool success) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *vmname; + g_autofree char *vmname =3D NULL; const char *virt =3D virDomainAuditGetVirtType(vm->def); =20 virUUIDFormat(vm->def->uuid, uuidstr); @@ -722,8 +692,6 @@ virDomainAuditResource(virDomainObj *vm, const char *re= source, "virt=3D%s resrc=3D%s reason=3D%s %s uuid=3D%s old-%s=3D%lld= new-%s=3D%lld", virt, resource, reason, vmname, uuidstr, resource, oldval, resource, newval); - - VIR_FREE(vmname); } =20 void @@ -756,7 +724,7 @@ virDomainAuditLifecycle(virDomainObj *vm, const char *o= p, const char *reason, bool success) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *vmname; + g_autofree char *vmname =3D NULL; const char *virt =3D virDomainAuditGetVirtType(vm->def); =20 virUUIDFormat(vm->def->uuid, uuidstr); @@ -769,8 +737,6 @@ virDomainAuditLifecycle(virDomainObj *vm, const char *o= p, VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_CONTROL, success, "virt=3D%s op=3D%s reason=3D%s %s uuid=3D%s vm-pid=3D%lld", virt, op, reason, vmname, uuidstr, (long long)vm->pid); - - VIR_FREE(vmname); } =20 =20 @@ -851,7 +817,7 @@ virDomainAuditInit(virDomainObj *vm, ino_t pidns) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *vmname; + g_autofree char *vmname =3D NULL; const char *virt =3D virDomainAuditGetVirtType(vm->def); =20 virUUIDFormat(vm->def->uuid, uuidstr); @@ -865,8 +831,6 @@ virDomainAuditInit(virDomainObj *vm, "virt=3D%s op=3Dinit %s uuid=3D%s vm-pid=3D%lld init-pid=3D%= lld pid-ns=3D%lld", virt, vmname, uuidstr, (long long)vm->pid, (long long)initpi= d, (long long)pidns); - - VIR_FREE(vmname); } =20 void @@ -879,7 +843,7 @@ void virDomainAuditSecurityLabel(virDomainObj *vm, bool success) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *vmname; + g_autofree char *vmname =3D NULL; size_t i; const char *virt =3D virDomainAuditGetVirtType(vm->def); =20 @@ -897,8 +861,6 @@ virDomainAuditSecurityLabel(virDomainObj *vm, bool succ= ess) VIR_AUDIT_STR(vm->def->seclabels[i]->imagelabel), VIR_AUDIT_STR(vm->def->seclabels[i]->model)); } - - VIR_FREE(vmname); } =20 void @@ -907,16 +869,16 @@ virDomainAuditShmem(virDomainObj *vm, const char *reason, bool success) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *vmname =3D virAuditEncode("vm", vm->def->name); + g_autofree char *vmname =3D virAuditEncode("vm", vm->def->name); const char *srcpath =3D virDomainChrSourceDefGetPath(def->server.chr); const char *virt =3D virDomainAuditGetVirtType(vm->def); - char *shmpath =3D NULL; + g_autofree char *shmpath =3D NULL; =20 virUUIDFormat(vm->def->uuid, uuidstr); =20 if (!vmname) { VIR_WARN("OOM while encoding audit message"); - goto cleanup; + return; } =20 shmpath =3D g_strdup_printf("/dev/shm/%s", def->name); @@ -936,11 +898,6 @@ virDomainAuditShmem(virDomainObj *vm, "virt=3D%s resrc=3Dshmem reason=3D%s %s uuid=3D%s size= =3D%llu path=3D%s", virt, reason, vmname, uuidstr, def->size, VIR_AUDIT_STR(= shmpath)); } - - cleanup: - VIR_FREE(vmname); - VIR_FREE(shmpath); - return; } =20 =20 diff --git a/src/conf/node_device_util.c b/src/conf/node_device_util.c index dfec1a91ce..c2fa73afc1 100644 --- a/src/conf/node_device_util.c +++ b/src/conf/node_device_util.c @@ -78,7 +78,7 @@ virNodeDeviceCreateVport(virStorageAdapterFCHost *fchost) { unsigned int parent_host; char *name =3D NULL; - char *parent_hoststr =3D NULL; + g_autofree char *parent_hoststr =3D NULL; bool skip_capable_check =3D false; =20 VIR_DEBUG("parent=3D'%s', wwnn=3D'%s' wwpn=3D'%s'", @@ -91,27 +91,27 @@ virNodeDeviceCreateVport(virStorageAdapterFCHost *fchos= t) fchost->parent_wwpn))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("cannot find parent using provided wwnn/wwpn"= )); - goto cleanup; + return name; } } else if (fchost->parent_fabric_wwn) { if (!(parent_hoststr =3D virVHBAGetHostByFabricWWN(NULL, fchost->parent_fabric_wwn)))= { virReportError(VIR_ERR_XML_ERROR, "%s", _("cannot find parent using provided fabric_wwn= ")); - goto cleanup; + return name; } } else { if (!(parent_hoststr =3D virVHBAFindVportHost(NULL))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("'parent' for vHBA not specified, and " "cannot find one on this host")); - goto cleanup; + return name; } skip_capable_check =3D true; } =20 if (virSCSIHostGetNumber(parent_hoststr, &parent_host) < 0) - goto cleanup; + return name; =20 /* NOTE: * We do not save the parent_hoststr in fchost->parent since @@ -125,23 +125,21 @@ virNodeDeviceCreateVport(virStorageAdapterFCHost *fch= ost) virReportError(VIR_ERR_XML_ERROR, _("parent '%s' specified for vHBA does not exist"), parent_hoststr); - goto cleanup; + return name; } =20 if (virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, VPORT_CREATE) < 0) - goto cleanup; + return name; =20 /* Let's ensure the device was created */ virWaitForDevices(); if (!(name =3D virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn)))= { ignore_value(virVHBAManageVport(parent_host, fchost->wwpn, fchost-= >wwnn, VPORT_DELETE)); - goto cleanup; + return name; } =20 - cleanup: - VIR_FREE(parent_hoststr); return name; } =20 @@ -160,11 +158,10 @@ int virNodeDeviceDeleteVport(virConnectPtr conn, virStorageAdapterFCHost *fchost) { - char *name =3D NULL; - char *scsi_host_name =3D NULL; + g_autofree char *name =3D NULL; + g_autofree char *scsi_host_name =3D NULL; unsigned int parent_host; - char *vhba_parent =3D NULL; - int ret =3D -1; + g_autofree char *vhba_parent =3D NULL; =20 VIR_DEBUG("conn=3D%p parent=3D'%s', managed=3D'%d' wwnn=3D'%s' wwpn=3D= '%s'", conn, NULLSTR(fchost->parent), fchost->managed, @@ -179,7 +176,7 @@ virNodeDeviceDeleteVport(virConnectPtr conn, virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to find fc_host for wwnn=3D'%s' and wwpn= =3D'%s'"), fchost->wwnn, fchost->wwpn); - goto cleanup; + return -1; } =20 scsi_host_name =3D g_strdup_printf("scsi_%s", name); @@ -193,36 +190,28 @@ virNodeDeviceDeleteVport(virConnectPtr conn, * was the same as the scsi_host - meaning we have a pool * backed to an HBA, so there won't be a vHBA to delete */ if (STREQ(scsi_host_name, fchost->parent)) { - ret =3D 0; - goto cleanup; + return 0; } =20 if (virSCSIHostGetNumber(fchost->parent, &parent_host) < 0) - goto cleanup; + return -1; } else { if (!(vhba_parent =3D virNodeDeviceGetParentName(conn, scsi_host_n= ame))) - goto cleanup; + return -1; =20 /* If the parent is not a scsi_host, then this is a pool backed * directly to an HBA and there's no vHBA to remove - so we're don= e */ if (!STRPREFIX(vhba_parent, "scsi_host")) { - ret =3D 0; - goto cleanup; + return 0; } =20 if (virSCSIHostGetNumber(vhba_parent, &parent_host) < 0) - goto cleanup; + return -1; } =20 if (virVHBAManageVport(parent_host, fchost->wwpn, fchost->wwnn, VPORT_DELETE) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - VIR_FREE(name); - VIR_FREE(vhba_parent); - VIR_FREE(scsi_host_name); - return ret; + return 0; } diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 9a95ae6c12..39f36ca29d 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2375,10 +2375,10 @@ virNWFilterRuleDefFixup(virNWFilterRuleDef *rule) static virNWFilterRuleDef * virNWFilterRuleParse(xmlNodePtr node) { - char *action; - char *direction; - char *prio; - char *statematch; + g_autofree char *action =3D NULL; + g_autofree char *direction =3D NULL; + g_autofree char *prio =3D NULL; + g_autofree char *statematch =3D NULL; bool found; int found_i =3D 0; int priority; @@ -2476,17 +2476,11 @@ virNWFilterRuleParse(xmlNodePtr node) =20 virNWFilterRuleDefFixup(ret); =20 - cleanup: - VIR_FREE(prio); - VIR_FREE(action); - VIR_FREE(direction); - VIR_FREE(statematch); - return ret; =20 err_exit: g_clear_pointer(&ret, virNWFilterRuleDefFree); - goto cleanup; + return ret; } =20 =20 @@ -2521,7 +2515,7 @@ virNWFilterIsAllowedChain(const char *chainname) { virNWFilterChainSuffixType i; const char *name; - char *msg; + g_autofree char *msg =3D NULL; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; bool printed =3D false; =20 @@ -2559,7 +2553,6 @@ virNWFilterIsAllowedChain(const char *chainname) msg =3D virBufferContentAndReset(&buf); =20 virReportError(VIR_ERR_INVALID_ARG, "%s", msg); - VIR_FREE(msg); =20 return NULL; } @@ -2571,8 +2564,8 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) virNWFilterDef *ret; xmlNodePtr curr =3D ctxt->node; char *uuid =3D NULL; - char *chain =3D NULL; - char *chain_pri_s =3D NULL; + g_autofree char *chain =3D NULL; + g_autofree char *chain_pri_s =3D NULL; virNWFilterEntry *entry; int chain_priority; const char *name_prefix; @@ -2671,16 +2664,11 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) curr =3D curr->next; } =20 - VIR_FREE(chain); - VIR_FREE(chain_pri_s); - return ret; =20 cleanup: virNWFilterDefFree(ret); - VIR_FREE(chain); VIR_FREE(uuid); - VIR_FREE(chain_pri_s); return NULL; } =20 @@ -2707,24 +2695,21 @@ virNWFilterSaveConfig(const char *configDir, virNWFilterDef *def) { int ret =3D -1; - char *xml; + g_autofree char *xml =3D NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *configFile =3D NULL; + g_autofree char *configFile =3D NULL; =20 if (!(xml =3D virNWFilterDefFormat(def))) - goto cleanup; + return ret; =20 if (!(configFile =3D virFileBuildPath(configDir, def->name, ".xml"))) - goto cleanup; + return ret; =20 virUUIDFormat(def->uuid, uuidstr); ret =3D virXMLSaveFile(configFile, virXMLPickShellSafeComment(def->name, uuidstr), "nwfilter-edit", xml); =20 - cleanup: - VIR_FREE(configFile); - VIR_FREE(xml); return ret; } =20 @@ -2733,23 +2718,19 @@ int virNWFilterDeleteDef(const char *configDir, virNWFilterDef *def) { - int ret =3D -1; - char *configFile =3D NULL; + g_autofree char *configFile =3D NULL; =20 if (!(configFile =3D virFileBuildPath(configDir, def->name, ".xml"))) - goto error; + return -1; =20 if (unlink(configFile) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot remove config for %s"), def->name); - goto error; + return -1; } =20 - ret =3D 0; - error: - VIR_FREE(configFile); - return ret; + return 0; } =20 =20 diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 635d2ec0b0..c75ecf3a04 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -260,8 +260,7 @@ virNetworkObjMacMgrAdd(virNetworkObj *obj, const virMacAddr *mac) { char macStr[VIR_MAC_STRING_BUFLEN]; - char *file =3D NULL; - int ret =3D -1; + g_autofree char *file =3D NULL; =20 if (!obj->macmap) return 0; @@ -269,18 +268,15 @@ virNetworkObjMacMgrAdd(virNetworkObj *obj, virMacAddrFormat(mac, macStr); =20 if (!(file =3D virMacMapFileName(dnsmasqStateDir, obj->def->bridge))) - goto cleanup; + return -1; =20 if (virMacMapAdd(obj->macmap, domain, macStr) < 0) - goto cleanup; + return -1; =20 if (virMacMapWriteFile(obj->macmap, file) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - VIR_FREE(file); - return ret; + return 0; } =20 =20 @@ -291,8 +287,7 @@ virNetworkObjMacMgrDel(virNetworkObj *obj, const virMacAddr *mac) { char macStr[VIR_MAC_STRING_BUFLEN]; - char *file =3D NULL; - int ret =3D -1; + g_autofree char *file =3D NULL; =20 if (!obj->macmap) return 0; @@ -300,18 +295,15 @@ virNetworkObjMacMgrDel(virNetworkObj *obj, virMacAddrFormat(mac, macStr); =20 if (!(file =3D virMacMapFileName(dnsmasqStateDir, obj->def->bridge))) - goto cleanup; + return -1; =20 if (virMacMapRemove(obj->macmap, domain, macStr) < 0) - goto cleanup; + return -1; =20 if (virMacMapWriteFile(obj->macmap, file) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - VIR_FREE(file); - return ret; + return 0; } =20 =20 @@ -819,20 +811,16 @@ virNetworkObjSaveStatus(const char *statusDir, virNetworkObj *obj, virNetworkXMLOption *xmlopt) { - int ret =3D -1; int flags =3D 0; - char *xml; + g_autofree char *xml =3D NULL; =20 if (!(xml =3D virNetworkObjFormat(obj, xmlopt, flags))) - goto cleanup; + return -1; =20 if (virNetworkSaveXML(statusDir, obj->def, xml)) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - VIR_FREE(xml); - return ret; + return 0; } =20 =20 @@ -953,29 +941,30 @@ virNetworkLoadConfig(virNetworkObjList *nets, const char *name, virNetworkXMLOption *xmlopt) { - char *configFile =3D NULL, *autostartLink =3D NULL; + g_autofree char *configFile =3D NULL; + g_autofree char *autostartLink =3D NULL; g_autoptr(virNetworkDef) def =3D NULL; virNetworkObj *obj; bool saveConfig =3D false; int autostart; =20 if ((configFile =3D virNetworkConfigFile(configDir, name)) =3D=3D NULL) - goto error; + return NULL; if ((autostartLink =3D virNetworkConfigFile(autostartDir, name)) =3D= =3D NULL) - goto error; + return NULL; =20 if ((autostart =3D virFileLinkPointsTo(autostartLink, configFile)) < 0) - goto error; + return NULL; =20 if (!(def =3D virNetworkDefParse(NULL, configFile, xmlopt, false))) - goto error; + return NULL; =20 if (STRNEQ(name, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Network config filename '%s'" " does not match network name '%s'"), configFile, def->name); - goto error; + return NULL; } =20 switch ((virNetworkForwardType) def->forward.type) { @@ -1005,7 +994,7 @@ virNetworkLoadConfig(virNetworkObjList *nets, case VIR_NETWORK_FORWARD_LAST: default: virReportEnumRangeError(virNetworkForwardType, def->forward.type); - goto error; + return NULL; } =20 /* The network didn't have a UUID so we generated a new one, and @@ -1016,25 +1005,17 @@ virNetworkLoadConfig(virNetworkObjList *nets, =20 if (saveConfig && virNetworkSaveConfig(configDir, def, xmlopt) < 0) { - goto error; + return NULL; } =20 if (!(obj =3D virNetworkObjAssignDef(nets, def, 0))) - goto error; + return NULL; =20 def =3D NULL; =20 obj->autostart =3D (autostart =3D=3D 1); =20 - VIR_FREE(configFile); - VIR_FREE(autostartLink); - return obj; - - error: - VIR_FREE(configFile); - VIR_FREE(autostartLink); - return NULL; } =20 =20 @@ -1110,14 +1091,13 @@ virNetworkObjDeleteConfig(const char *configDir, const char *autostartDir, virNetworkObj *obj) { - char *configFile =3D NULL; - char *autostartLink =3D NULL; - int ret =3D -1; + g_autofree char *configFile =3D NULL; + g_autofree char *autostartLink =3D NULL; =20 if (!(configFile =3D virNetworkConfigFile(configDir, obj->def->name))) - goto error; + return -1; if (!(autostartLink =3D virNetworkConfigFile(autostartDir, obj->def->n= ame))) - goto error; + return -1; =20 /* Not fatal if this doesn't work */ unlink(autostartLink); @@ -1127,15 +1107,10 @@ virNetworkObjDeleteConfig(const char *configDir, virReportSystemError(errno, _("cannot remove config file '%s'"), configFile); - goto error; + return -1; } =20 - ret =3D 0; - - error: - VIR_FREE(configFile); - VIR_FREE(autostartLink); - return ret; + return 0; } =20 =20 diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 035e3fe758..37f5376976 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -415,22 +415,18 @@ virNetworkPortDefDeleteStatus(virNetworkPortDef *def, const char *dir) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *path; - int ret =3D -1; + g_autofree char *path =3D NULL; =20 virUUIDFormat(def->uuid, uuidstr); =20 if (!(path =3D virNetworkPortDefConfigFile(dir, uuidstr))) - goto cleanup; + return -1; =20 if (unlink(path) < 0 && errno !=3D ENOENT) { virReportSystemError(errno, _("Unable to delete %s"), path); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - VIR_FREE(path); - return ret; + return 0; } diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbinding= obj.c index 6e67c5c7b6..862f825422 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -146,8 +146,8 @@ int virNWFilterBindingObjSave(const virNWFilterBindingObj *obj, const char *statusDir) { - char *filename; - char *xml =3D NULL; + g_autofree char *filename =3D NULL; + g_autofree char *xml =3D NULL; int ret =3D -1; =20 if (!(filename =3D virNWFilterBindingObjConfigFile(statusDir, @@ -155,22 +155,19 @@ virNWFilterBindingObjSave(const virNWFilterBindingObj= *obj, return -1; =20 if (!(xml =3D virNWFilterBindingObjFormat(obj))) - goto cleanup; + return -1; =20 if (g_mkdir_with_parents(statusDir, 0777) < 0) { virReportSystemError(errno, _("cannot create config directory '%s'"), statusDir); - goto cleanup; + return -1; } =20 ret =3D virXMLSaveFile(filename, obj->def->portdevname, "nwfilter-binding-create", xml); =20 - cleanup: - VIR_FREE(xml); - VIR_FREE(filename); return ret; } =20 @@ -179,8 +176,7 @@ int virNWFilterBindingObjDelete(const virNWFilterBindingObj *obj, const char *statusDir) { - char *filename; - int ret =3D -1; + g_autofree char *filename =3D NULL; =20 if (!(filename =3D virNWFilterBindingObjConfigFile(statusDir, obj->def->portdevname= ))) @@ -191,14 +187,10 @@ virNWFilterBindingObjDelete(const virNWFilterBindingO= bj *obj, virReportSystemError(errno, _("Unable to remove status '%s' for nwfilter = binding %s'"), filename, obj->def->portdevname); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - VIR_FREE(filename); - return ret; + return 0; } =20 =20 diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index e8dfe66b3c..a8574beb79 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -282,19 +282,15 @@ virNWFilterDefEqual(const virNWFilterDef *def1, virNWFilterDef *def2) { bool ret =3D false; - char *xml1 =3D NULL; - char *xml2 =3D NULL; + g_autofree char *xml1 =3D NULL; + g_autofree char *xml2 =3D NULL; =20 if (!(xml1 =3D virNWFilterDefFormat(def1)) || !(xml2 =3D virNWFilterDefFormat(def2))) - goto cleanup; + return false; =20 ret =3D STREQ(xml1, xml2); =20 - cleanup: - VIR_FREE(xml1); - VIR_FREE(xml2); - return ret; } =20 @@ -573,7 +569,7 @@ virNWFilterObjListLoadConfig(virNWFilterObjList *nwfilt= ers, { virNWFilterDef *def =3D NULL; virNWFilterObj *obj; - char *configFile =3D NULL; + g_autofree char *configFile =3D NULL; =20 if (!(configFile =3D virFileBuildPath(configDir, name, ".xml"))) goto error; @@ -597,11 +593,9 @@ virNWFilterObjListLoadConfig(virNWFilterObjList *nwfil= ters, if (!(obj =3D virNWFilterObjListAssignDef(nwfilters, def))) goto error; =20 - VIR_FREE(configFile); return obj; =20 error: - VIR_FREE(configFile); virNWFilterDefFree(def); return NULL; } diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 98d9e0b97e..e6c187e80a 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1088,9 +1088,8 @@ static int getSCSIHostNumber(virStorageAdapterSCSIHost *scsi_host, unsigned int *hostnum) { - int ret =3D -1; unsigned int num; - char *name =3D NULL; + g_autofree char *name =3D NULL; =20 if (scsi_host->has_parent) { virPCIDeviceAddress *addr =3D &scsi_host->parentaddr; @@ -1101,20 +1100,17 @@ getSCSIHostNumber(virStorageAdapterSCSIHost *scsi_h= ost, addr->slot, addr->function, unique_id))) - goto cleanup; + return -1; if (virSCSIHostGetNumber(name, &num) < 0) - goto cleanup; + return -1; } else { if (virSCSIHostGetNumber(scsi_host->name, &num) < 0) - goto cleanup; + return -1; } =20 *hostnum =3D num; - ret =3D 0; =20 - cleanup: - VIR_FREE(name); - return ret; + return 0; } =20 =20 @@ -1147,9 +1143,9 @@ matchFCHostToSCSIHost(virStorageAdapterFCHost *fchost, { virConnectPtr conn =3D NULL; bool ret =3D false; - char *name =3D NULL; - char *scsi_host_name =3D NULL; - char *parent_name =3D NULL; + g_autofree char *name =3D NULL; + g_autofree char *scsi_host_name =3D NULL; + g_autofree char *parent_name =3D NULL; =20 /* If we have a parent defined, get its hostnum, and compare to the * scsi_hostnum. If they are the same, then we have a match @@ -1202,9 +1198,6 @@ matchFCHostToSCSIHost(virStorageAdapterFCHost *fchost, */ =20 cleanup: - VIR_FREE(name); - VIR_FREE(parent_name); - VIR_FREE(scsi_host_name); virConnectClose(conn); return ret; } --=20 2.33.0 From nobody Sat May 18 08:35:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1672922002; cv=none; d=zohomail.com; s=zohoarc; b=WzRpX64UcXUxsDCDz2fvRMV+f5E53tx5W0RFbuRN9rMq8On9x4DKySjTIdj4nnnm5VS3BUeLsyMZ8yBmVJSK992DZbo21yFqvBjIS1P8kNKffaqzEaidWr/cGqnHFSDaa/FTZoO/6qYAWk0O8nFENjRLrUpTuehccnPVBHgSYYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672922002; h=Content-Type:Content-Transfer-Encoding:Cc: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=eZJHPVmsdJ14lvLgdUOfaKOobT4ssP+6uVAyDVr2wlc=; b=mkidOkG36hK5iduPBvgfOMkTt4RVmBrRA1v+CjdGpn7fwaUk4QWz2B54nMV0icWrUS5Hmr9O/NkFe9fsf6EBdwve1d35eCnPVdXFwyHoZkAQjp98kF8HDVhZ0kjX7L5qVfPrWf3ew+G9b/u1UnTPtRhLDIRyHz0PshedxBUkyq8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1672922002644590.7913566320767; Thu, 5 Jan 2023 04:33:22 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-297-QbuXl9oVMdShL6Sei2k5nA-1; Thu, 05 Jan 2023 07:33:18 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CF031100F908; Thu, 5 Jan 2023 12:33:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB67A40C2064; Thu, 5 Jan 2023 12:33:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id ADE6D1946589; Thu, 5 Jan 2023 12:33:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A04B319465A8 for ; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 84B121400E44; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D3A0140EBF6 for ; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 63FB9181E3F3 for ; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-280-G8zuV__oN9KAJ5eZO6PVEQ-1; Thu, 05 Jan 2023 07:33:08 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Nnm6r23BxzRqMq for ; Thu, 5 Jan 2023 20:31:32 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 5 Jan 2023 20:33:05 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672922001; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=eZJHPVmsdJ14lvLgdUOfaKOobT4ssP+6uVAyDVr2wlc=; b=Cq0ycWTLL4jzxuc+YqezjRpl+APtglh4J52Wd1Ex1giAp+EI/xo2ceKTPftfZpSSaOrZiE w0ZR4rAA0Km3j9ujDfsddDrQtwxm/Eak9uA+9fVYnYfkjykaYsKXg3PIGAszR7Nm0OtfGv lKsz9QgLeQanGX7o4GN/sCRmmB/j9D8= X-MC-Unique: QbuXl9oVMdShL6Sei2k5nA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: G8zuV__oN9KAJ5eZO6PVEQ-1 From: Jiang Jiacheng To: Subject: [PATCH 2/9] interface: use g_autofree and remove unnecessary label Date: Thu, 5 Jan 2023 20:26:48 +0800 Message-ID: <20230105122655.3413625-3-jiangjiacheng@huawei.com> In-Reply-To: <20230105122655.3413625-1-jiangjiacheng@huawei.com> References: <20230105122655.3413625-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhengchuan@huawei.com, linyilu@huawei.com, jiangjiacheng@huawei.com, xiexiangyou@huawei.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672922004404100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: Jonathon Jongsma --- src/interface/interface_backend_udev.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interfa= ce_backend_udev.c index 979f187d87..54b43fb999 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -879,24 +879,23 @@ udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED, const char *name, virInterfaceDef *ifacedef) { - char *procpath =3D NULL; - char *buf =3D NULL; + g_autofree char *procpath =3D NULL; + g_autofree char *buf =3D NULL; char *vid_pos, *dev_pos; size_t vid_len, dev_len; const char *vid_prefix =3D "VID: "; const char *dev_prefix =3D "\nDevice: "; - int ret =3D -1; =20 procpath =3D g_strdup_printf("/proc/net/vlan/%s", name); =20 if (virFileReadAll(procpath, BUFSIZ, &buf) < 0) - goto cleanup; + return -1; =20 if ((vid_pos =3D strstr(buf, vid_prefix)) =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to find the VID for the VLAN device '%s'"= ), name); - goto cleanup; + return -1; } vid_pos +=3D strlen(vid_prefix); =20 @@ -905,14 +904,14 @@ udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED, virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to find the VID for the VLAN device '%s'"= ), name); - goto cleanup; + return -1; } =20 if ((dev_pos =3D strstr(vid_pos + vid_len, dev_prefix)) =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to find the real device for the VLAN devi= ce '%s'"), name); - goto cleanup; + return -1; } dev_pos +=3D strlen(dev_prefix); =20 @@ -920,18 +919,13 @@ udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED, virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to find the real device for the VLAN devi= ce '%s'"), name); - goto cleanup; + return -1; } =20 ifacedef->data.vlan.tag =3D g_strndup(vid_pos, vid_len); ifacedef->data.vlan.dev_name =3D g_strndup(dev_pos, dev_len); =20 - ret =3D 0; - - cleanup: - VIR_FREE(procpath); - VIR_FREE(buf); - return ret; + return 0; } =20 static virInterfaceDef * ATTRIBUTE_NONNULL(1) --=20 2.33.0 From nobody Sat May 18 08:35:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1672922008; cv=none; d=zohomail.com; s=zohoarc; b=YGskaSGmxdAeA+iAchuxQAoCoB2wWsUFMHw0uvLfnENCyNet9JLQ1jSNBiX6N22LVUEcGSJiyt5wA6vlH2DZg2T2NUtOi26hayjPxYE+diVj/4j0WxPX3VKKyWOP6CyOUCC5Mn9qllS2WGD+s6MC/zP1V4+0/P3f6qOkFncOV4M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672922008; h=Content-Type:Content-Transfer-Encoding:Cc: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=FQWLKvRbGX3RjhZGrGy69LLlRfxhfkx5OZDXZP3Bl2o=; b=CSgyGpbEzawJjqCbhKev2wK5K7nTdbXyxQ0THBIBFzrNocm/tWVRrbni2/cHYPzGpHVuPVFTEoqnzMz7uUk9aW5+yHgxcSihmXD2croF0jMG9Qq/4DzCZ/piE/98cBlWPhG+wDttAm8QAxK1s6A39qrZfmED0FTaXweWh2b0bmg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1672922008975342.66035106943434; Thu, 5 Jan 2023 04:33:28 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-426-wLyK4CdtNLiNPZA1GnjMbA-1; Thu, 05 Jan 2023 07:33:23 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 08926857F42; Thu, 5 Jan 2023 12:33:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5F8653AA; Thu, 5 Jan 2023 12:33:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D56BD1946589; Thu, 5 Jan 2023 12:33:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CFC2F1946586 for ; Thu, 5 Jan 2023 12:33:19 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B32EA40C2004; Thu, 5 Jan 2023 12:33:19 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AB8AB40C2064 for ; Thu, 5 Jan 2023 12:33:19 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8BA9B85C6E1 for ; Thu, 5 Jan 2023 12:33:19 +0000 (UTC) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-304-n86nofoXOHGKnLY5uS7fBg-1; Thu, 05 Jan 2023 07:33:09 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Nnm6z0z7cz16MVD for ; Thu, 5 Jan 2023 20:31:39 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 5 Jan 2023 20:33:05 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672922007; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=FQWLKvRbGX3RjhZGrGy69LLlRfxhfkx5OZDXZP3Bl2o=; b=eBLRXCuIc8T3J3mgCCEODjfdz1CTNzbglDSlG/1x2mQ50vppiacQkXYs61EMVIWH3rtMAJ CxlEHtUZHVY7Y1Iff3PVoOjVLaON7iAFvA69JouGdWapUwxv5qrm0dmdEpgOFHkuci9oz2 uyIK/YcYBuCV1H/nR2GtnM7p6sHaqFc= X-MC-Unique: wLyK4CdtNLiNPZA1GnjMbA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: n86nofoXOHGKnLY5uS7fBg-1 From: Jiang Jiacheng To: Subject: [PATCH 3/9] locking: use g_autofree and remove unnecessary label Date: Thu, 5 Jan 2023 20:26:49 +0800 Message-ID: <20230105122655.3413625-4-jiangjiacheng@huawei.com> In-Reply-To: <20230105122655.3413625-1-jiangjiacheng@huawei.com> References: <20230105122655.3413625-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhengchuan@huawei.com, linyilu@huawei.com, jiangjiacheng@huawei.com, xiexiangyou@huawei.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672922010491100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: Jonathon Jongsma --- src/locking/lock_driver_lockd.c | 36 +++++++++--------------- src/locking/lock_driver_sanlock.c | 46 ++++++++++++------------------- 2 files changed, 31 insertions(+), 51 deletions(-) diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index e902b01463..4df12e0105 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -190,8 +190,8 @@ static virNetClient *virLockManagerLockDaemonConnection= New(bool privileged, virNetClientP= rogram **prog) { virNetClient *client =3D NULL; - char *lockdpath; - char *daemonPath =3D NULL; + g_autofree char *lockdpath =3D NULL; + g_autofree char *daemonPath =3D NULL; =20 *prog =3D NULL; =20 @@ -220,14 +220,9 @@ static virNetClient *virLockManagerLockDaemonConnectio= nNew(bool privileged, if (virNetClientAddProgram(client, *prog) < 0) goto error; =20 - VIR_FREE(daemonPath); - VIR_FREE(lockdpath); - return client; =20 error: - VIR_FREE(daemonPath); - VIR_FREE(lockdpath); virNetClientClose(client); virObjectUnref(client); virObjectUnref(*prog); @@ -517,10 +512,9 @@ static int virLockManagerLockDaemonAddResource(virLock= Manager *lock, unsigned int flags) { virLockManagerLockDaemonPrivate *priv =3D lock->privateData; - char *newName =3D NULL; - char *newLockspace =3D NULL; + g_autofree char *newName =3D NULL; + g_autofree char *newLockspace =3D NULL; bool autoCreate =3D false; - int ret =3D -1; =20 virCheckFlags(VIR_LOCK_MANAGER_RESOURCE_READONLY | VIR_LOCK_MANAGER_RESOURCE_SHARED, -1); @@ -533,7 +527,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anager *lock, if (params || nparams) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpected parameters for disk resource")); - goto cleanup; + return -1; } if (!driver->autoDiskLease) { if (!(flags & (VIR_LOCK_MANAGER_RESOURCE_SHARED | @@ -549,7 +543,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anager *lock, driver->lvmLockSpaceDir) { VIR_DEBUG("Trying to find an LVM UUID for %s", name); if (virLockManagerGetLVMKey(name, &newName) < 0) - goto cleanup; + return -1; =20 if (newName) { VIR_DEBUG("Got an LVM UUID %s for %s", newName, name); @@ -565,7 +559,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anager *lock, driver->scsiLockSpaceDir) { VIR_DEBUG("Trying to find an SCSI ID for %s", name); if (virStorageFileGetSCSIKey(name, &newName, false) < 0) - goto cleanup; + return -1; =20 if (newName) { VIR_DEBUG("Got an SCSI ID %s for %s", newName, name); @@ -580,7 +574,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anager *lock, if (driver->fileLockSpaceDir) { newLockspace =3D g_strdup(driver->fileLockSpaceDir); if (virCryptoHashString(VIR_CRYPTO_HASH_SHA256, name, &newName= ) < 0) - goto cleanup; + return -1; autoCreate =3D true; VIR_DEBUG("Using indirect lease %s for %s", newName, name); } else { @@ -599,7 +593,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anager *lock, if (params[i].value.ul !=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Offset must be zero for this lock ma= nager")); - goto cleanup; + return -1; } } else if (STREQ(params[i].key, "lockspace")) { lockspace =3D params[i].value.str; @@ -609,13 +603,13 @@ static int virLockManagerLockDaemonAddResource(virLoc= kManager *lock, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected parameter %s for lease resour= ce"), params[i].key); - goto cleanup; + return -1; } } if (!path || !lockspace) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing path or lockspace for lease resource= ")); - goto cleanup; + return -1; } newLockspace =3D g_strdup_printf("%s/%s", path, lockspace); newName =3D g_strdup(name); @@ -625,7 +619,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anager *lock, virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown lock manager object type %d"), type); - goto cleanup; + return -1; } =20 VIR_EXPAND_N(priv->resources, priv->nresources, 1); @@ -640,11 +634,7 @@ static int virLockManagerLockDaemonAddResource(virLock= Manager *lock, priv->resources[priv->nresources-1].flags |=3D VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE; =20 - ret =3D 0; - cleanup: - VIR_FREE(newLockspace); - VIR_FREE(newName); - return ret; + return 0; } =20 =20 diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index 2dceb1eefc..438779f926 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -118,9 +118,8 @@ virLockManagerSanlockLoadConfig(virLockManagerSanlockDr= iver *driver, const char *configFile) { g_autoptr(virConf) conf =3D NULL; - int ret =3D -1; - char *user =3D NULL; - char *group =3D NULL; + g_autofree char *user =3D NULL; + g_autofree char *group =3D NULL; =20 if (access(configFile, R_OK) =3D=3D -1) { if (errno !=3D ENOENT) { @@ -136,38 +135,34 @@ virLockManagerSanlockLoadConfig(virLockManagerSanlock= Driver *driver, return -1; =20 if (virConfGetValueBool(conf, "auto_disk_leases", &driver->autoDiskLea= se) < 0) - goto cleanup; + return -1; =20 if (virConfGetValueString(conf, "disk_lease_dir", &driver->autoDiskLea= sePath) < 0) - goto cleanup; + return -1; =20 if (virConfGetValueUInt(conf, "host_id", &driver->hostID) < 0) - goto cleanup; + return -1; =20 driver->requireLeaseForDisks =3D !driver->autoDiskLease; if (virConfGetValueBool(conf, "require_lease_for_disks", &driver->requ= ireLeaseForDisks) < 0) - goto cleanup; + return -1; =20 if (virConfGetValueUInt(conf, "io_timeout", &driver->io_timeout) < 0) - goto cleanup; + return -1; =20 if (virConfGetValueString(conf, "user", &user) < 0) - goto cleanup; + return -1; if (user && virGetUserID(user, &driver->user) < 0) - goto cleanup; + return -1; =20 if (virConfGetValueString(conf, "group", &group) < 0) - goto cleanup; + return -1; if (group && virGetGroupID(group, &driver->group) < 0) - goto cleanup; + return -1; =20 - ret =3D 0; - cleanup: - VIR_FREE(user); - VIR_FREE(group); - return ret; + return 0; } =20 static int @@ -778,8 +773,7 @@ virLockManagerSanlockRegisterKillscript(int sock, { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; char *path; - char *args =3D NULL; - int ret =3D -1; + g_autofree char *args =3D NULL; int rv; =20 switch (action) { @@ -796,7 +790,7 @@ virLockManagerSanlockRegisterKillscript(int sock, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Failure action %s is not supported by sanlock"), virDomainLockFailureTypeToString(action)); - goto cleanup; + return -1; } =20 virBufferEscape(&buf, '\\', "\\ ", "%s", vmuri); @@ -820,14 +814,14 @@ virLockManagerSanlockRegisterKillscript(int sock, virReportError(VIR_ERR_INTERNAL_ERROR, _("Sanlock helper path is longer than %d: '%s'"), SANLK_HELPER_PATH_LEN - 1, path); - goto cleanup; + return -1; } if (strlen(args) >=3D SANLK_HELPER_ARGS_LEN) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Sanlock helper arguments are longer than %d:" " '%s'"), SANLK_HELPER_ARGS_LEN - 1, args); - goto cleanup; + return -1; } =20 if ((rv =3D sanlock_killpath(sock, 0, path, args)) < 0) { @@ -842,14 +836,10 @@ virLockManagerSanlockRegisterKillscript(int sock, _("Failed to register lock failure" " action")); } - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - VIR_FREE(args); - return ret; + return 0; } =20 static int virLockManagerSanlockAcquire(virLockManager *lock, --=20 2.33.0 From nobody Sat May 18 08:35:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1672922002; cv=none; d=zohomail.com; s=zohoarc; b=HNt3YgE9z3yUOhzWY1qjQv+kgSJenHmGBa6e5JPXLcYMTMuWmqfKouX2NEILIkZzgYJtKtYq4+uvDDgdyL46f2SRZDOInhO85ZVShnUmG486kyMu23o9AsXOc8T+Jy97K8703zgmsV/93MgJiCy1qiieb5X4DboOOWmU/Z1C6dY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672922002; h=Content-Type:Content-Transfer-Encoding:Cc: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=Z/Kh2tvO1x/TxERdbuvECbf1bAVFBYIjwSueu+YJqQg=; b=BYoJfw7xb5umeisUpfFTRDwFR1ZqrZurycv0wmYmbnr/bx0qmzvIlb9pqsHZAJHKnlPHDd7ROJyHCZQjwF8chMmf7FpTHJi5qIzeBYlbFqwCe2I7GQhDFLUtofEQBkYHOkhFHnsdXeLAmSTCjtrndOLtAoMW2tJT4/Fe6Hmoonk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1672922002550721.3560151220016; Thu, 5 Jan 2023 04:33:22 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-166-HRmSHtJjPjmYwpXq6B7uXQ-1; Thu, 05 Jan 2023 07:33:16 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 009E0857F4B; Thu, 5 Jan 2023 12:33:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB97A40C2064; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A7CDD194658D; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D75DB1946586 for ; Thu, 5 Jan 2023 12:33:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BDB041121315; Thu, 5 Jan 2023 12:33:11 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast09.extmail.prod.ext.rdu2.redhat.com [10.11.55.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B5DEC1121314 for ; Thu, 5 Jan 2023 12:33:11 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9819D2999B23 for ; Thu, 5 Jan 2023 12:33:11 +0000 (UTC) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-644-BQpfC4bhO9y6_7GIT0y6mg-1; Thu, 05 Jan 2023 07:33:09 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Nnm6y5Tj7znTWZ for ; Thu, 5 Jan 2023 20:31:38 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 5 Jan 2023 20:33:06 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672922001; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=Z/Kh2tvO1x/TxERdbuvECbf1bAVFBYIjwSueu+YJqQg=; b=gxhZBbNdfjQ6m5P7CGRp4GUrq/M24nIEGiGPVLuqMdIxvAuppMkaCxUkaUoG16IeKFxZdS B8GCCVnI+9o3mOA2X3ivxtH//Fv7xCqC89NpmCccjj3FQ4Sf9dsRppb4yqBQ904PSiCJ5N i7RcuRtFkgNIsYSiRHbrAZv7/rXWgYw= X-MC-Unique: HRmSHtJjPjmYwpXq6B7uXQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: BQpfC4bhO9y6_7GIT0y6mg-1 From: Jiang Jiacheng To: Subject: [PATCH 4/9] remote: use g_autofree and remove unnecessary label Date: Thu, 5 Jan 2023 20:26:50 +0800 Message-ID: <20230105122655.3413625-5-jiangjiacheng@huawei.com> In-Reply-To: <20230105122655.3413625-1-jiangjiacheng@huawei.com> References: <20230105122655.3413625-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhengchuan@huawei.com, linyilu@huawei.com, jiangjiacheng@huawei.com, xiexiangyou@huawei.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672922004407100004 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: Jonathon Jongsma --- src/remote/remote_driver.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index b0dba9057b..316a11b10f 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -3833,23 +3833,19 @@ struct remoteAuthInteractState { static int remoteAuthFillFromConfig(virConnectPtr conn, struct remoteAuthInteractState *state) { - int ret =3D -1; int ninteract; const char *credname; - char *path =3D NULL; + g_autofree char *path =3D NULL; =20 VIR_DEBUG("Trying to fill auth parameters from config file"); =20 if (!state->config) { if (virAuthGetConfigFilePath(conn, &path) < 0) - goto cleanup; - if (path =3D=3D NULL) { - ret =3D 0; - goto cleanup; - } - + return -1; + if (path =3D=3D NULL) + return 0; if (!(state->config =3D virAuthConfigNew(path))) - goto cleanup; + return -1; } =20 for (ninteract =3D 0; state->interact[ninteract].id !=3D 0; ninteract+= +) { @@ -3879,7 +3875,7 @@ static int remoteAuthFillFromConfig(virConnectPtr con= n, VIR_URI_SERVER(conn->uri), credname, &value) < 0) - goto cleanup; + return -1; =20 if (value) { state->interact[ninteract].result =3D value; @@ -3887,11 +3883,7 @@ static int remoteAuthFillFromConfig(virConnectPtr co= nn, } } =20 - ret =3D 0; - - cleanup: - VIR_FREE(path); - return ret; + return 0; } =20 =20 --=20 2.33.0 From nobody Sat May 18 08:35:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1672922005; cv=none; d=zohomail.com; s=zohoarc; b=jAZIAVbDNc+IFMXLEWAMfFMm1ZbpbUgDIpUKPKwPEqgjHyMu9TZRhHieZUejgE71q/c8SxmlLUL9UeE91e5rIbHM+HQRolJBT0jQh9Yc86oDNIRCy51DSQH+JGcZWCHLxLaqDQTPPxRhkOWDl2MpbHS/hvSDyLSLiAac6dwqo7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672922005; h=Content-Type:Content-Transfer-Encoding:Cc: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=UdZMB56Uj6xMDus53ElWOrRY1YmnveGqjkaiLldVokg=; b=Sp5eMKs++0Resj8le0nyJTgffCdNKrdSKtypkmTlM5iw7bT8xclkHaSZw+5wZfiJKqLPvLY9uiExMpSTNB3tCYlJdW9XP3x1tZ9An5magQO/jZNIDKmgTQlwGtalPUMeA/yecKCAmw1YI47alFiKB8mZPGQz1bgLTqJ9FTU3M7A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1672922005898456.64534799635715; Thu, 5 Jan 2023 04:33:25 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-78-j1c5LPpnMTuzGTCK2Lo5qg-1; Thu, 05 Jan 2023 07:33:20 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 35ABF29DD996; Thu, 5 Jan 2023 12:33:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 226501121315; Thu, 5 Jan 2023 12:33:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 110651946589; Thu, 5 Jan 2023 12:33:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1ADF41946589 for ; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0EA24492B0B; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 06BF8492B08 for ; Thu, 5 Jan 2023 12:33:12 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D4E7138123B6 for ; Thu, 5 Jan 2023 12:33:12 +0000 (UTC) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-571-JgU_OR-4N1WXceytgHi6lg-1; Thu, 05 Jan 2023 07:33:10 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Nnm3G3YMWzqTwn for ; Thu, 5 Jan 2023 20:28:26 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 5 Jan 2023 20:33:06 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672922004; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=UdZMB56Uj6xMDus53ElWOrRY1YmnveGqjkaiLldVokg=; b=L84gtZnOMlGrF9N9wbenhZrK8rH0ETf+Zm8P2l1josszes7TodL4BHrrokhxVypiXYlS2j OIhSZ2tSwoSWxmRphewBt0uwm0Z6ZQaexLVOb+kxsutHwGglPZ84ZKVdMLrmUr28o7oHFC 0w5a3/yZWDJBrA1c9nwH+R2XY0Zc77k= X-MC-Unique: j1c5LPpnMTuzGTCK2Lo5qg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: JgU_OR-4N1WXceytgHi6lg-1 From: Jiang Jiacheng To: Subject: [PATCH 5/9] rpc: use g_autofree and remove unnecessary label Date: Thu, 5 Jan 2023 20:26:51 +0800 Message-ID: <20230105122655.3413625-6-jiangjiacheng@huawei.com> In-Reply-To: <20230105122655.3413625-1-jiangjiacheng@huawei.com> References: <20230105122655.3413625-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhengchuan@huawei.com, linyilu@huawei.com, jiangjiacheng@huawei.com, xiexiangyou@huawei.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672922006387100008 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: Jonathon Jongsma --- src/rpc/virnetclientprogram.c | 6 ++---- src/rpc/virnettlscontext.c | 16 +++++----------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c index 5da118bfd3..b93c495347 100644 --- a/src/rpc/virnetclientprogram.c +++ b/src/rpc/virnetclientprogram.c @@ -208,7 +208,7 @@ int virNetClientProgramDispatch(virNetClientProgram *pr= og, virNetMessage *msg) { virNetClientProgramEvent *event; - char *evdata; + g_autofree char *evdata =3D NULL; =20 VIR_DEBUG("prog=3D%d ver=3D%d type=3D%d status=3D%d serial=3D%d proc= =3D%d", msg->header.prog, msg->header.vers, msg->header.type, @@ -250,14 +250,12 @@ int virNetClientProgramDispatch(virNetClientProgram *= prog, evdata =3D g_new0(char, event->msg_len); =20 if (virNetMessageDecodePayload(msg, event->msg_filter, evdata) < 0) - goto cleanup; + return 0; =20 event->func(prog, client, evdata, prog->eventOpaque); =20 xdr_free(event->msg_filter, evdata); =20 - cleanup: - VIR_FREE(evdata); return 0; } =20 diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index acfc4f9323..cfd26f0701 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -474,7 +474,7 @@ static gnutls_x509_crt_t virNetTLSContextLoadCertFromFi= le(const char *certFile, { gnutls_datum_t data; gnutls_x509_crt_t cert =3D NULL; - char *buf =3D NULL; + g_autofree char *buf =3D NULL; int ret =3D -1; =20 VIR_DEBUG("isServer %d certFile %s", @@ -506,7 +506,6 @@ static gnutls_x509_crt_t virNetTLSContextLoadCertFromFi= le(const char *certFile, if (ret !=3D 0) { g_clear_pointer(&cert, gnutls_x509_crt_deinit); } - VIR_FREE(buf); return cert; } =20 @@ -517,14 +516,13 @@ static int virNetTLSContextLoadCACertListFromFile(con= st char *certFile, size_t *ncerts) { gnutls_datum_t data; - char *buf =3D NULL; - int ret =3D -1; + g_autofree char *buf =3D NULL; =20 *ncerts =3D 0; VIR_DEBUG("certFile %s", certFile); =20 if (virFileReadAll(certFile, (1<<16), &buf) < 0) - goto cleanup; + return -1; =20 data.data =3D (unsigned char *)buf; data.size =3D strlen(buf); @@ -533,15 +531,11 @@ static int virNetTLSContextLoadCACertListFromFile(con= st char *certFile, virReportError(VIR_ERR_SYSTEM_ERROR, _("Unable to import CA certificate list %s"), certFile); - goto cleanup; + return -1; } *ncerts =3D certMax; =20 - ret =3D 0; - - cleanup: - VIR_FREE(buf); - return ret; + return 0; } =20 =20 --=20 2.33.0 From nobody Sat May 18 08:35:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1672922002; cv=none; d=zohomail.com; s=zohoarc; b=He7HzEDhZToWy0YVfkiTuiQygNgrDMJOhEGGQ8kagAngcsJ5GTji3jBVOAFnNFqbQ3DQI19fptHl/y4hqUmmfs6Avts1DOwIrOW1R50tXReaWinZFAQwxdJuE9m07O2TBgSoGx6n5QLl7oce6oZUNmeuPOjhgEGfRHxvC0TeRUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672922002; h=Content-Type:Content-Transfer-Encoding:Cc: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=HfBa3TUwB1B6QpftIxgtVfTZ/edCKexvSkhEHApg3q8=; b=Bwpf0+k5inV0eezdo6us8170ghElmTaYSf5MX6FWQarPuWD156HImhifyn66VVF17JiECU9XRlsDkuw2HvappUBRots9bBF+obCCydqwg0JPt2E0eH/OIW4U5wCSAAnMQThfD8MTn+YjiIh8Nc5Y51IEbq5Uj8vQV0sqIuO2f+I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1672922001975963.8224696776416; Thu, 5 Jan 2023 04:33:21 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-635-i1DYKBLLPa2kzuJALXWA9g-1; Thu, 05 Jan 2023 07:33:16 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9C5E3801779; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86F692026D4B; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 707321946589; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id ED94F1946589 for ; Thu, 5 Jan 2023 12:33:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CF5AD40ED784; Thu, 5 Jan 2023 12:33:12 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C5D364015309 for ; Thu, 5 Jan 2023 12:33:12 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AA787181E3FE for ; Thu, 5 Jan 2023 12:33:12 +0000 (UTC) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-90-OmzZUlqJMNGVEe2nxls7Ow-1; Thu, 05 Jan 2023 07:33:10 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Nnm6z4HvjznTWv for ; Thu, 5 Jan 2023 20:31:39 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 5 Jan 2023 20:33:07 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672922000; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=HfBa3TUwB1B6QpftIxgtVfTZ/edCKexvSkhEHApg3q8=; b=e2nwCAd33qy/dMuD6OligGtegxnSGfa2HrUdtxG5Z//O2pyrvShqC/EOJA4UIKYLYg7oN+ evL48eeXipIaLOPDWTN5mXNNATUQ7snn/oZJWvA0cLPSPc2SqNlp82hxHKifHV9gEAODRO N9MYQDNrs/HWK+6YusXlfAl8n6H7v4o= X-MC-Unique: i1DYKBLLPa2kzuJALXWA9g-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: OmzZUlqJMNGVEe2nxls7Ow-1 From: Jiang Jiacheng To: Subject: [PATCH 6/9] security: use g_autofree and remove unnecessary label Date: Thu, 5 Jan 2023 20:26:52 +0800 Message-ID: <20230105122655.3413625-7-jiangjiacheng@huawei.com> In-Reply-To: <20230105122655.3413625-1-jiangjiacheng@huawei.com> References: <20230105122655.3413625-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhengchuan@huawei.com, linyilu@huawei.com, jiangjiacheng@huawei.com, xiexiangyou@huawei.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672922002434100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: Jonathon Jongsma --- src/security/security_apparmor.c | 91 +++++++++++--------------------- 1 file changed, 31 insertions(+), 60 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 36e8ce42b5..64b57f6a22 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -70,9 +70,9 @@ struct SDPDOP { static int profile_status(const char *str, const int check_enforcing) { - char *content =3D NULL; - char *tmp =3D NULL; - char *etmp =3D NULL; + g_autofree char *content =3D NULL; + g_autofree char *tmp =3D NULL; + g_autofree char *etmp =3D NULL; int rc =3D -2; =20 /* create string that is ' \0' for accurate matching */ @@ -87,7 +87,7 @@ profile_status(const char *str, const int check_enforcing) virReportSystemError(errno, _("Failed to read AppArmor profiles list " "\'%s\'"), APPARMOR_PROFILES_PATH); - goto cleanup; + return -2; } =20 if (strstr(content, tmp) !=3D NULL) @@ -99,11 +99,6 @@ profile_status(const char *str, const int check_enforcin= g) rc =3D 1; /* return '1' if loaded and enforcin= g */ } =20 - VIR_FREE(content); - cleanup: - VIR_FREE(tmp); - VIR_FREE(etmp); - return rc; } =20 @@ -320,12 +315,11 @@ AppArmorSetSecurityHostLabel(virSCSIVHostDevice *dev = G_GNUC_UNUSED, static int AppArmorSecurityManagerProbe(const char *virtDriver G_GNUC_UNUSED) { - char *template_qemu =3D NULL; - char *template_lxc =3D NULL; - int rc =3D SECURITY_DRIVER_DISABLE; + g_autofree char *template_qemu =3D NULL; + g_autofree char *template_lxc =3D NULL; =20 if (use_apparmor() < 0) - return rc; + return SECURITY_DRIVER_DISABLE; =20 /* see if template file exists */ template_qemu =3D g_strdup_printf("%s/TEMPLATE.qemu", APPARMOR_DIR "/l= ibvirt"); @@ -334,20 +328,15 @@ AppArmorSecurityManagerProbe(const char *virtDriver G= _GNUC_UNUSED) if (!virFileExists(template_qemu)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("template \'%s\' does not exist"), template_qemu); - goto cleanup; + return SECURITY_DRIVER_DISABLE; } if (!virFileExists(template_lxc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("template \'%s\' does not exist"), template_lxc); - goto cleanup; + return SECURITY_DRIVER_DISABLE; } - rc =3D SECURITY_DRIVER_ENABLE; =20 - cleanup: - VIR_FREE(template_qemu); - VIR_FREE(template_lxc); - - return rc; + return SECURITY_DRIVER_ENABLE; } =20 /* Security driver initialization. DOI is for 'Domain of Interpretation' a= nd is @@ -387,8 +376,7 @@ static int AppArmorGenSecurityLabel(virSecurityManager *mgr G_GNUC_UNUSED, virDomainDef *def) { - int rc =3D -1; - char *profile_name =3D NULL; + g_autofree char *profile_name =3D NULL; virSecurityLabelDef *secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME); =20 @@ -402,18 +390,18 @@ AppArmorGenSecurityLabel(virSecurityManager *mgr G_GN= UC_UNUSED, if (secdef->baselabel) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Cannot set a base label with AppArmour")); - return rc; + return -1; } =20 if (secdef->label || secdef->imagelabel) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("security label already defined for VM")); - return rc; + return -1; } =20 if ((profile_name =3D get_profile_name(def)) =3D=3D NULL) - return rc; + return -1; =20 secdef->label =3D g_strdup(profile_name); =20 @@ -431,18 +419,13 @@ AppArmorGenSecurityLabel(virSecurityManager *mgr G_GN= UC_UNUSED, goto err; } =20 - rc =3D 0; - goto cleanup; + return 0; =20 err: VIR_FREE(secdef->label); VIR_FREE(secdef->imagelabel); VIR_FREE(secdef->model); - - cleanup: - VIR_FREE(profile_name); - - return rc; + return -1; } =20 static int @@ -476,33 +459,29 @@ AppArmorGetSecurityProcessLabel(virSecurityManager *m= gr G_GNUC_UNUSED, { int rc =3D -1; int status; - char *profile_name =3D NULL; + g_autofree char *profile_name =3D NULL; =20 if ((profile_name =3D get_profile_name(def)) =3D=3D NULL) - return rc; + return -1; =20 status =3D profile_status(profile_name, 1); if (status < -1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error getting profile status")); - goto cleanup; + return -1; } else if (status =3D=3D -1) { sec->label[0] =3D '\0'; } else { if (virStrcpy(sec->label, profile_name, VIR_SECURITY_LABEL_BUFLEN)= < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error copying profile name")); - goto cleanup; + return -1; } } =20 sec->enforcing =3D status =3D=3D 1; - rc =3D 0; - - cleanup: - VIR_FREE(profile_name); =20 - return rc; + return 0; } =20 /* Called on VM shutdown and destroy. See AppArmorGenSecurityLabel (above)= for @@ -555,7 +534,7 @@ AppArmorSetSecurityProcessLabel(virSecurityManager *mgr= G_GNUC_UNUSED, virDomainDef *def) { int rc =3D -1; - char *profile_name =3D NULL; + g_autofree char *profile_name =3D NULL; virSecurityLabelDef *secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME); =20 @@ -563,7 +542,7 @@ AppArmorSetSecurityProcessLabel(virSecurityManager *mgr= G_GNUC_UNUSED, return 0; =20 if ((profile_name =3D get_profile_name(def)) =3D=3D NULL) - return rc; + return -1; =20 if (STRNEQ(SECURITY_APPARMOR_NAME, secdef->model)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -572,21 +551,17 @@ AppArmorSetSecurityProcessLabel(virSecurityManager *m= gr G_GNUC_UNUSED, "hypervisor driver is \'%s\'."), secdef->model, SECURITY_APPARMOR_NAME); if (use_apparmor() > 0) - goto cleanup; + return -1; } =20 VIR_DEBUG("Changing AppArmor profile to %s", profile_name); if (aa_change_profile(profile_name) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("error calling aa_change_profile()")); - goto cleanup; + return -1; } - rc =3D 0; - - cleanup: - VIR_FREE(profile_name); =20 - return rc; + return 0; } =20 /* Called directly by API user prior to virCommandRun(). @@ -600,8 +575,8 @@ AppArmorSetSecurityChildProcessLabel(virSecurityManager= *mgr G_GNUC_UNUSED, virCommand *cmd) { int rc =3D -1; - char *profile_name =3D NULL; - char *cmd_str =3D NULL; + g_autofree char *profile_name =3D NULL; + g_autofree char *cmd_str =3D NULL; virSecurityLabelDef *secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME); =20 @@ -615,21 +590,17 @@ AppArmorSetSecurityChildProcessLabel(virSecurityManag= er *mgr G_GNUC_UNUSED, "hypervisor driver is \'%s\'."), secdef->model, SECURITY_APPARMOR_NAME); if (use_apparmor() > 0) - goto cleanup; + return -1; } =20 if ((profile_name =3D get_profile_name(def)) =3D=3D NULL) - goto cleanup; + return -1; =20 cmd_str =3D virCommandToString(cmd, false); VIR_DEBUG("Changing AppArmor profile to %s on %s", profile_name, cmd_s= tr); virCommandSetAppArmorProfile(cmd, profile_name); - rc =3D 0; =20 - cleanup: - VIR_FREE(profile_name); - VIR_FREE(cmd_str); - return rc; + return 0; } =20 static int --=20 2.33.0 From nobody Sat May 18 08:35:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1672922047; cv=none; d=zohomail.com; s=zohoarc; b=Vw0/l0oO1TzFZ+r10aDkNvyrGLu0VDDfq3vuLP3flh+SMLjrElRtigRoGziHOSl2/LshZJfuAr4HYzwWUZ83k2jj16CvvvowDO9FfSXl+5fFe8Rz8tadRoMLuGsKSavQ/puh8NZiEq4b+O857zyV7ZjUCo5AfVRNf9KY5YAjBvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672922047; h=Content-Type:Content-Transfer-Encoding:Cc: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=O/nfPg4fARj0LUoWsnEWhpwke/8czEKYFB/RTr9tqQc=; b=cK6HHH6R6daF92M5ShOUHs0KxQXeruhSZFEDAV2ouz7LlYNRWq4TtvuynG0VQUgr0SxkSrjUzEAg7AgvAdspAkDFWvzj/WAJ7GO5N46UQkR9YR1XDMIjtS1JzEEG5oe8EzZ0t9mNCDeNHomPLjKXHjlbaUXds2LdJk6kkV8NmQ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1672922047716453.2436083527506; Thu, 5 Jan 2023 04:34:07 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-323-HGl91WeNOYms38zHOXrddA-1; Thu, 05 Jan 2023 07:33:21 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BE3CE3C0E459; Thu, 5 Jan 2023 12:33:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A83AAC15BA0; Thu, 5 Jan 2023 12:33:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8BA9C19465B1; Thu, 5 Jan 2023 12:33:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 13C23194658C for ; Thu, 5 Jan 2023 12:33:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 09407400E107; Thu, 5 Jan 2023 12:33:16 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 019F040ED784 for ; Thu, 5 Jan 2023 12:33:15 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DC527181E087 for ; Thu, 5 Jan 2023 12:33:15 +0000 (UTC) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-636-1KZTQERiP5WWdyz1OvypoA-1; Thu, 05 Jan 2023 07:33:10 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Nnm6t2T4yzRqy4 for ; Thu, 5 Jan 2023 20:31:34 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 5 Jan 2023 20:33:07 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672922046; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=O/nfPg4fARj0LUoWsnEWhpwke/8czEKYFB/RTr9tqQc=; b=FkODvyxMksnnv82AIFxqHk8vucGlvBmNe8ISOXE8kmpvKcdSUziRYrjcOxIm92m4AybnyD wONfrzPHidY8I/YTTwl+JkYWWEzGqlPxSaV78OVL+vDr7bvqsBRW9gPJANINd6UnSVnFKo 0hEXlPl8AuzpT0fO1NvOuEVmJNJl7Do= X-MC-Unique: HGl91WeNOYms38zHOXrddA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 1KZTQERiP5WWdyz1OvypoA-1 From: Jiang Jiacheng To: Subject: [PATCH 7/9] util: use g_autofree and remove unnecessary label Date: Thu, 5 Jan 2023 20:26:53 +0800 Message-ID: <20230105122655.3413625-8-jiangjiacheng@huawei.com> In-Reply-To: <20230105122655.3413625-1-jiangjiacheng@huawei.com> References: <20230105122655.3413625-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhengchuan@huawei.com, linyilu@huawei.com, jiangjiacheng@huawei.com, xiexiangyou@huawei.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672922048016100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: Jonathon Jongsma --- src/util/virconf.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/src/util/virconf.c b/src/util/virconf.c index 8a96805642..c39489973b 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -716,7 +716,7 @@ virConfParse(const char *filename, const char *content,= int len, virConf * virConfReadFile(const char *filename, unsigned int flags) { - char *content; + g_autofree char *content =3D NULL; int len; virConf *conf; =20 @@ -732,8 +732,6 @@ virConfReadFile(const char *filename, unsigned int flag= s) =20 conf =3D virConfParse(filename, content, len, flags); =20 - VIR_FREE(content); - return conf; } =20 @@ -1413,7 +1411,7 @@ virConfWriteFile(const char *filename, virConf *conf) virConfEntry *cur; int ret; int fd; - char *content; + g_autofree char *content =3D NULL; unsigned int use; =20 if (conf =3D=3D NULL) @@ -1434,7 +1432,6 @@ virConfWriteFile(const char *filename, virConf *conf) use =3D virBufferUse(&buf); content =3D virBufferContentAndReset(&buf); ret =3D safewrite(fd, content, use); - VIR_FREE(content); VIR_FORCE_CLOSE(fd); if (ret !=3D (int)use) { virConfError(NULL, VIR_ERR_WRITE_FAILED, _("failed to save content= ")); @@ -1462,7 +1459,7 @@ virConfWriteMem(char *memory, int *len, virConf *conf) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virConfEntry *cur; - char *content; + g_autofree char *content =3D NULL; unsigned int use; =20 if ((memory =3D=3D NULL) || (len =3D=3D NULL) || (*len <=3D 0) || (con= f =3D=3D NULL)) @@ -1479,11 +1476,9 @@ virConfWriteMem(char *memory, int *len, virConf *con= f) =20 if ((int)use >=3D *len) { *len =3D (int)use; - VIR_FREE(content); return -1; } memcpy(memory, content, use); - VIR_FREE(content); *len =3D use; return use; } @@ -1506,26 +1501,20 @@ virConfLoadConfigPath(const char *name) int virConfLoadConfig(virConf **conf, const char *name) { - char *path =3D NULL; - int ret =3D -1; + g_autofree char *path =3D NULL; =20 *conf =3D NULL; =20 if (!(path =3D virConfLoadConfigPath(name))) - goto cleanup; + return -1; =20 if (!virFileExists(path)) { - ret =3D 0; - goto cleanup; + return 0; } =20 VIR_DEBUG("Loading config file '%s'", path); if (!(*conf =3D virConfReadFile(path, 0))) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - VIR_FREE(path); - return ret; + return 0; } --=20 2.33.0 From nobody Sat May 18 08:35:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1672922004; cv=none; d=zohomail.com; s=zohoarc; b=KZH7sbPRzFCseCZ8k94LaTbv9Fpgxyq0fQK1EBVQ6yfiJWN6cylFSQ1Uoc699MXO87dbmu7ZROPdmUIzraG5sDLMi/KAx2FfK0VE8tL5axnaSoaw9HcoG9AUyRn3IoWVJsXisBTEN2DdEET8sRuPhurXYOYHuQKJLAxbLjnP01A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672922004; h=Content-Type:Content-Transfer-Encoding:Cc: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=m0QFghfrd39npiOjPPVeNMtMSRlUCKHc+GGEwPAq/lM=; b=b+wiW5vYCx9IH/KoJO7jitkWgiD/iBtv2U0mOxoSQSDVPK+oyz54sBhdoHV1KVBQwGof9uGax82efmTGMtN5IPFpOVARGfhuNzYXPa4Q21q5uI+Ijm1xcKYPUepWWrJ6PBvJjCq9/XjNP6B9UBJ57PqDDQHlBKCkBwGnDhILthg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1672922004767681.3099029520987; Thu, 5 Jan 2023 04:33:24 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-456-N_dmOw-4Ps6HlE-gp6ZuHQ-1; Thu, 05 Jan 2023 07:33:19 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8C2EE38123C4; Thu, 5 Jan 2023 12:33:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6DB712166B34; Thu, 5 Jan 2023 12:33:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 50B4D19465B5; Thu, 5 Jan 2023 12:33:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8221E1946586 for ; Thu, 5 Jan 2023 12:33:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 64B224085725; Thu, 5 Jan 2023 12:33:14 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5C55C4085729 for ; Thu, 5 Jan 2023 12:33:14 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3AF6B857D0D for ; Thu, 5 Jan 2023 12:33:14 +0000 (UTC) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-524-KZalsT3nOKmWUwwah5BNoQ-1; Thu, 05 Jan 2023 07:33:11 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Nnm702zrdznTXG for ; Thu, 5 Jan 2023 20:31:40 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 5 Jan 2023 20:33:07 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672922003; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=m0QFghfrd39npiOjPPVeNMtMSRlUCKHc+GGEwPAq/lM=; b=XJHPjBAlAu/2HfKbwkF1Hn1HtUZ/rAhl/P3pPg7nSlKGNY6FD9IlVuqjRD3jvOmq/HWWYp 1j4bOc3BRzHWa3ZgU3PL+5E87I3iEgePYJULmyhYE3tNT10DCHPcx6BDv+y57n2CfpZjZc dROR1kKXpPy5xVWKflzhCBAJkARqMUc= X-MC-Unique: N_dmOw-4Ps6HlE-gp6ZuHQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: KZalsT3nOKmWUwwah5BNoQ-1 From: Jiang Jiacheng To: Subject: [PATCH 8/9] vmware: use g_autofree and remove unnecessary label Date: Thu, 5 Jan 2023 20:26:54 +0800 Message-ID: <20230105122655.3413625-9-jiangjiacheng@huawei.com> In-Reply-To: <20230105122655.3413625-1-jiangjiacheng@huawei.com> References: <20230105122655.3413625-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhengchuan@huawei.com, linyilu@huawei.com, jiangjiacheng@huawei.com, xiexiangyou@huawei.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672922006384100007 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: Jonathon Jongsma --- src/vmware/vmware_conf.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 80a85f4d0f..5703ce717e 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -338,9 +338,8 @@ int vmwareVmxPath(virDomainDef *vmdef, char **vmxPath) { virDomainDiskDef *disk =3D NULL; - char *directoryName =3D NULL; - char *fileName =3D NULL; - int ret =3D -1; + g_autofree char *directoryName =3D NULL; + g_autofree char *fileName =3D NULL; size_t i; const char *src; =20 @@ -355,7 +354,7 @@ vmwareVmxPath(virDomainDef *vmdef, char **vmxPath) virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Domain XML doesn't contain any disks, " "cannot deduce datastore and path for VMX file")); - goto cleanup; + return -1; } =20 for (i =3D 0; i < vmdef->ndisks; ++i) { @@ -370,7 +369,7 @@ vmwareVmxPath(virDomainDef *vmdef, char **vmxPath) virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Domain XML doesn't contain any file-based harddi= sks, " "cannot deduce datastore and path for VMX file")); - goto cleanup; + return -1; } =20 src =3D virDomainDiskGetSource(disk); @@ -378,27 +377,22 @@ vmwareVmxPath(virDomainDef *vmdef, char **vmxPath) virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("First file-based harddisk has no source, cannot " "deduce datastore and path for VMX file")); - goto cleanup; + return -1; } =20 if (vmwareParsePath(src, &directoryName, &fileName) < 0) - goto cleanup; + return -1; =20 if (!virStringHasCaseSuffix(fileName, ".vmdk")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting source '%s' of first file-based harddi= sk " "to be a VMDK image"), src); - goto cleanup; + return -1; } =20 vmwareConstructVmxPath(directoryName, vmdef->name, vmxPath); =20 - ret =3D 0; - - cleanup: - VIR_FREE(directoryName); - VIR_FREE(fileName); - return ret; + return 0; } =20 int @@ -436,8 +430,8 @@ vmwareMakePath(char *srcDir, char *srcName, char *srcEx= t, char **outpath) int vmwareExtractPid(const char * vmxPath) { - char *vmxDir =3D NULL; - char *logFilePath =3D NULL; + g_autofree char *vmxDir =3D NULL; + g_autofree char *logFilePath =3D NULL; FILE *logFile =3D NULL; char line[1024]; char *tmp =3D NULL; @@ -473,8 +467,6 @@ vmwareExtractPid(const char * vmxPath) } =20 cleanup: - VIR_FREE(vmxDir); - VIR_FREE(logFilePath); VIR_FORCE_FCLOSE(logFile); return pid_value; } --=20 2.33.0 From nobody Sat May 18 08:35:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1672922020; cv=none; d=zohomail.com; s=zohoarc; b=NSNlLiuEn0ljq73O104YHkYrLlMymfqI7G4P6pQHd0lED/kj1oqgFBazCa9TK7G8a46c9rjskee26c56R8VRW1BeSUHYBokr2VujrK/iO/R5idh7Y+soTHEB57eA59cG3gMdG+3nrVaxjqkNqbcmdGxWrsbeGFLWlADEp8OFuSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672922020; h=Content-Type:Content-Transfer-Encoding:Cc: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=gMohrj4+gQFM+6E72ru/PLuIBk7HC/Yqxkpocfjowpk=; b=OzJozx73PZb1twyaVLnHUvXB7x214N9zFUt0ZksqGjiY/obV3bdqNGTv0/YKChFA41OFgwQ7WyvMZj7coKTVQKcU5sJHfr/5oxpjKQbygXtrBf3SlPf164sXB2qjxJD+fA8Od6rOV+FgGL2NjOqShLH0HWhNaKre4cFpzGHEpiM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1672922020955202.55806660585608; Thu, 5 Jan 2023 04:33:40 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-312-8b1RfXX8Nxe2gzAviM3AsQ-1; Thu, 05 Jan 2023 07:33:23 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 46F7F38123C2; Thu, 5 Jan 2023 12:33:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27254492B09; Thu, 5 Jan 2023 12:33:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E70D019465BA; Thu, 5 Jan 2023 12:33:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E01E619465A2 for ; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CE92D1415303; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C723E14152F6 for ; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ACB6F857A9F for ; Thu, 5 Jan 2023 12:33:13 +0000 (UTC) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-167-olu5w8uPOhG_r8UCCVintg-1; Thu, 05 Jan 2023 07:33:11 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Nnm3J0zLqzqTwp for ; Thu, 5 Jan 2023 20:28:28 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 5 Jan 2023 20:33:08 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672922019; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=gMohrj4+gQFM+6E72ru/PLuIBk7HC/Yqxkpocfjowpk=; b=Bshc/uR77CpQsX3WC0iuM7dSCIeVgxCHYO+d230vkEWdTBde3haDTtXzMxX4ig8GYstP8t +c6E76dMU8llJy/+P43+i89OolhbdM2TbQkAW5qDlfHbpA5aXmrCptxmIQHJhBfeOj/euB gr7iP0o2j2GfAOFK62p7QyCCeGsWvBA= X-MC-Unique: 8b1RfXX8Nxe2gzAviM3AsQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: olu5w8uPOhG_r8UCCVintg-1 From: Jiang Jiacheng To: Subject: [PATCH 9/9] vz: use g_autofree and remove unnecessary label Date: Thu, 5 Jan 2023 20:26:55 +0800 Message-ID: <20230105122655.3413625-10-jiangjiacheng@huawei.com> In-Reply-To: <20230105122655.3413625-1-jiangjiacheng@huawei.com> References: <20230105122655.3413625-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhengchuan@huawei.com, linyilu@huawei.com, jiangjiacheng@huawei.com, xiexiangyou@huawei.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672922022482100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: Jonathon Jongsma --- src/vz/vz_utils.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index fcf6d363a9..219d13823b 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -151,7 +151,8 @@ vzInitCaps(unsigned long vzVersion, struct _vzCapabilit= ies *vzCaps) int vzInitVersion(struct _vzDriver *driver) { - char *output, *sVer, *tmp; + g_autofree char *output =3D NULL; + char *sVer, *tmp; const char *searchStr =3D "prlsrvctl version "; int ret =3D -1; =20 @@ -159,12 +160,12 @@ vzInitVersion(struct _vzDriver *driver) =20 if (!output) { vzParseError(); - goto cleanup; + return -1; } =20 if (!(sVer =3D strstr(output, searchStr))) { vzParseError(); - goto cleanup; + return -1; } =20 sVer =3D sVer + strlen(searchStr); @@ -173,26 +174,23 @@ vzInitVersion(struct _vzDriver *driver) * In libvirt we handle only first two numbers. */ if (!(tmp =3D strchr(sVer, '.'))) { vzParseError(); - goto cleanup; + return -1; } =20 if (!(tmp =3D strchr(tmp + 1, '.'))) { vzParseError(); - goto cleanup; + return -1; } =20 tmp[0] =3D '\0'; if (virStringParseVersion(&(driver->vzVersion), sVer, true) < 0) { vzParseError(); - goto cleanup; + return -1; } =20 vzInitCaps(driver->vzVersion, &driver->vzCaps); - ret =3D 0; =20 - cleanup: - VIR_FREE(output); - return ret; + return 0; } =20 static int --=20 2.33.0