From nobody Sat May 18 12:29:57 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=1672997114; cv=none; d=zohomail.com; s=zohoarc; b=montCmY1HEai7YDxEo84iqbptJB8H3r2Y/E8VG0GAkgTZ1yUyte4hEu/NKILHBi6zg4iFZ74gPcAQ4w9l7yaBiZvl5qMELw6dxev063L16sSfM4o56HSL3PLkFLiv4SnAuJSQXMSdHUKod+hizrvMrRLJ8yubL/JK20ldyeE7Jo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672997114; 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=5OC1Xvd4nx5SffalnTuPXMKe3s95xvGnGi9gqOeuSn8=; b=WhZSJ3OzaedY0y3ZoDNRz9uWXrHm0qnUMWZnev9OygJZ+K8bcY+joPyglECEi71QH2jUmsBl1qKug25yqTbsMSLQZ5eu8Q03gmhx0CSJzaRkCh9dVsFEajBHTJK98pMPV0GDNuXoSJA0aI9wUWgQg3gGo3CxHAtSDsgmy+rJYQ0= 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 1672997114029660.2997516338893; Fri, 6 Jan 2023 01:25:14 -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-561-yuCyeopQN2mqdx8DwKyaLg-1; Fri, 06 Jan 2023 04:25:06 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7BCF11C0A5BD; Fri, 6 Jan 2023 09:25:01 +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 297DC492D8B; Fri, 6 Jan 2023 09:25:01 +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 DCB3219465B3; Fri, 6 Jan 2023 09:25:00 +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 7EECE1946586 for ; Fri, 6 Jan 2023 09:24:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 754A4400E40A; Fri, 6 Jan 2023 09:24:59 +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 6C1D340C945A for ; Fri, 6 Jan 2023 09:24:59 +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 47A782999B31 for ; Fri, 6 Jan 2023 09:24:59 +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-618-v1r_km7EOAOAGqQ29zbluw-1; Fri, 06 Jan 2023 04:24:56 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NpHvJ2bC9znV5Q for ; Fri, 6 Jan 2023 17:23:24 +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; Fri, 6 Jan 2023 17:24:52 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672997113; 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=5OC1Xvd4nx5SffalnTuPXMKe3s95xvGnGi9gqOeuSn8=; b=QNXSKZJrL7epE6XDFkyocCmKUkZ6/T7u2SCtdBTapRI785BsB4NOoPOU1+jdsyi25SUtZ/ MlCXOpyPJrJZN/OfSvOFdVIGReJaRCCURmg0tKhG8LfGv1g0ZGwPbsftxj3rWcDFlbxDDh sApFZw9ImQsrkGFIjAz914011RoN4ng= X-MC-Unique: yuCyeopQN2mqdx8DwKyaLg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: v1r_km7EOAOAGqQ29zbluw-1 From: Jiang Jiacheng To: Subject: [PATCH V2 1/9] conf: use g_autofree and remove unnecessary label Date: Fri, 6 Jan 2023 17:18:31 +0800 Message-ID: <20230106091839.1263372-2-jiangjiacheng@huawei.com> In-Reply-To: <20230106091839.1263372-1-jiangjiacheng@huawei.com> References: <20230106091839.1263372-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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.10 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: 1672997114752100010 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_audit.c | 121 ++++++++++--------------------- src/conf/node_device_util.c | 49 +++++-------- src/conf/nwfilter_conf.c | 55 +++++--------- src/conf/virnetworkobj.c | 85 ++++++++-------------- src/conf/virnetworkportdef.c | 12 +-- src/conf/virnwfilterbindingobj.c | 22 ++---- src/conf/virnwfilterobj.c | 19 ++--- src/conf/virstorageobj.c | 23 ++---- 8 files changed, 129 insertions(+), 257 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..e5ea45b0b7 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; } @@ -2570,9 +2563,9 @@ 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 *uuid =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; @@ -2641,7 +2634,6 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) "%s", _("malformed uuid element")); goto cleanup; } - VIR_FREE(uuid); } =20 curr =3D curr->children; @@ -2671,16 +2663,10 @@ 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 +2693,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 +2716,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..2e75e90cf1 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -281,21 +281,14 @@ static bool 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; - - ret =3D STREQ(xml1, xml2); + return false; =20 - cleanup: - VIR_FREE(xml1); - VIR_FREE(xml2); - - return ret; + return STREQ(xml1, xml2); } =20 =20 @@ -573,7 +566,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 +590,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 12:29:57 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=1672997163; cv=none; d=zohomail.com; s=zohoarc; b=XbVjCj/64aoyQCNnh1aPECa0w3tvejMDgAQRnKNXZp58TGwoXJ70UaIWIeviR34ERWVk/Q+mgiU01o32mvb2loUcH33l20xc4Rx0+c9TotQJvQWrhaUo1szgUALNne9zKPcSs4awJY4kbv+TpvywvC/FpjCZWbdfLXcsxiE9k4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672997163; 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=FqFYcHPBsiDfkB+ThK8fyvORZ6wcongKPHUFT3AbQOqh0PzJdVUyXynGIxH97X073XIGwj4kDTlJ2A5M6q8/MXtvwdq0YhwzzOoaAcJhaRwW5PpgkM/mUDbsIz11fsMnQygmJh+VkFjZQdXl2GrkulisflqMNwQXPVAG63UslKM= 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 1672997163140824.8204709432289; Fri, 6 Jan 2023 01:26:03 -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-606-8ult53k2O6OqnQ3Ii6GZ-A-1; Fri, 06 Jan 2023 04:25:03 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 026E31C0A5A3; Fri, 6 Jan 2023 09:25:01 +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 DFC00140EBF5; Fri, 6 Jan 2023 09:25:00 +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 93CBB1946A40; Fri, 6 Jan 2023 09:25:00 +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 CD86E1946586 for ; Fri, 6 Jan 2023 09:24:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C2298492B07; Fri, 6 Jan 2023 09:24:58 +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 BA2FD492B06 for ; Fri, 6 Jan 2023 09:24:58 +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 9EBA729AA381 for ; Fri, 6 Jan 2023 09:24:58 +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-357-JQFtx0MsOrm-qKoY6uC3cQ-1; Fri, 06 Jan 2023 04:24:56 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NpHqc21MCzqTsK for ; Fri, 6 Jan 2023 17:20:12 +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; Fri, 6 Jan 2023 17:24:53 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672997162; 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=LoMKmMClltKEjbezOra+LsDRqYg9/p8S9/sDtlF0T6Q2XXcCrcISSnW4V+6LnZxrMjmC/i SpiTVHRxvfHK2aMvzbG6PzPHdqZsW6DTLFvgNIpsPqj7wx1tsJUrme7FYxd4X93Gmw2XdX 9Akx75Z54PXD3HkENt1mOMqJcdPOl04= X-MC-Unique: 8ult53k2O6OqnQ3Ii6GZ-A-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: JQFtx0MsOrm-qKoY6uC3cQ-1 From: Jiang Jiacheng To: Subject: [PATCH 2/9] interface: use g_autofree and remove unnecessary label Date: Fri, 6 Jan 2023 17:18:32 +0800 Message-ID: <20230106091839.1263372-3-jiangjiacheng@huawei.com> In-Reply-To: <20230106091839.1263372-1-jiangjiacheng@huawei.com> References: <20230106091839.1263372-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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.7 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: 1672997164957100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: J=C3=A1n Tomko --- 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 12:29:57 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=1672997165; cv=none; d=zohomail.com; s=zohoarc; b=SbYpwPuF2RrtzEUQ/15gug+pCnaUJiEySa9uzRfR7wQ75Qznq9D1r9Y3A8X6pPsc2G3JHi8BF1TTgirdl/zxxL7aN79vEr0l+lepi9P4REyWCEuz36VFVvZwt0U3sy3Tbhiyj7Hrj4IFaLuCahQtGsjJeXsFuN3ukKEbXmS0XWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672997165; 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=Befh0xW+gr+8exWTruSSMSMFtU5myFVEXUcYz0TqBV91nMC63R4qU+qM+0B7I39pXp/wDkeAUZPS3+JRi5zbEZJJcNhqALEmFO3YVvfQLc9Tr83YuBljJjQdPwsWDGHZ2G3ZFbMO0FvTgTsO/rWSAfIrUTsetgBKabWPbSeUycU= 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 16729971655411015.5444018394905; Fri, 6 Jan 2023 01:26: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-308-WPhXZmCJOcqZBUGClOyAXg-1; Fri, 06 Jan 2023 04:25:08 -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 B58CD282382B; Fri, 6 Jan 2023 09:25:03 +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 9F115492B06; Fri, 6 Jan 2023 09:25:03 +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 937EC1946595; Fri, 6 Jan 2023 09:25:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B84E41946586 for ; Fri, 6 Jan 2023 09:24:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AB794492B01; Fri, 6 Jan 2023 09:24:59 +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 A325D492B00 for ; Fri, 6 Jan 2023 09:24:59 +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 84FB13813F2E for ; Fri, 6 Jan 2023 09:24:59 +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-263-kXSf4eXpPKu6iNWVaW4cmg-1; Fri, 06 Jan 2023 04:24:57 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NpHvc2dHSzJqqV for ; Fri, 6 Jan 2023 17:23: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; Fri, 6 Jan 2023 17:24:53 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672997164; 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=DQGlGza5rf3Xx8cdZcwXAmJVMASJJTp10S//41lGMJF/24iSXyzQEarybp1MmJznFizPee auAU3XPBoDuZtOtdnu4kjR+kH9yDGEYSRcGwy3o8MgS3orn6SpK4EMRebRWz+11ep0uxW9 SINqOXvXVmuiG0S0aRR2BshCgiipvZ4= X-MC-Unique: WPhXZmCJOcqZBUGClOyAXg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: kXSf4eXpPKu6iNWVaW4cmg-1 From: Jiang Jiacheng To: Subject: [PATCH 3/9] locking: use g_autofree and remove unnecessary label Date: Fri, 6 Jan 2023 17:18:33 +0800 Message-ID: <20230106091839.1263372-4-jiangjiacheng@huawei.com> In-Reply-To: <20230106091839.1263372-1-jiangjiacheng@huawei.com> References: <20230106091839.1263372-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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.10 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: 1672997167002100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: J=C3=A1n Tomko --- 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 12:29:57 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=1672997112; cv=none; d=zohomail.com; s=zohoarc; b=MIHQn+CIHPuMD/kLtFz+u9vw2yCDMxEJsj/P5LZBh7eYeG7KDcpevvehBH8KgQnqFQiryeRcvzckRR03j6sPr9400IbnJVfCWBWIp+GuNx/OlzeqI4hKcImj5GAZ28R20wxGBDiTySGPtls7UTwGnFIsdhk+ZBVvaWlFdJIX0oM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672997112; 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=XNQq+DKTDjiPlQlAjvkEbWSPPtonWqAc91gSVU6Sk9KMCo+zzvi2Yh5+qDuTS7ZaWDL2eux7rQqswhxoSfIwAoz6D393f7q2JiG29e+PZmo9lIjBI32z4kCTc8Haa4mVo+T7WY/UoOMC9DLQdCSHP6QydeNzj3EIeZQLseu6yCA= 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 1672997112273972.9083061770107; Fri, 6 Jan 2023 01:25:12 -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-648-JGjOH9reO2e-uS-uXaPSTQ-1; Fri, 06 Jan 2023 04:25:06 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9FB9385C092; Fri, 6 Jan 2023 09:25:01 +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 8330E400E40A; Fri, 6 Jan 2023 09:25:01 +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 7801019465A8; Fri, 6 Jan 2023 09:25:01 +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 58AFA19465B3 for ; Fri, 6 Jan 2023 09:25:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4C8D24014CE6; Fri, 6 Jan 2023 09:25:00 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 44BE140C945A for ; Fri, 6 Jan 2023 09:25:00 +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 2B3D2101A52E for ; Fri, 6 Jan 2023 09:25:00 +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-76-3QELjk5oMbmZ_iQOo4HVow-1; Fri, 06 Jan 2023 04:24:58 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NpHvL2SYsz16MY0 for ; Fri, 6 Jan 2023 17:23: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; Fri, 6 Jan 2023 17:24:54 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672997111; 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=X6J718PzaoLG+fePrwlVqbe1BW27bKfa1yDCq5ezONyPJZ/HUIQqQ+L0s5Mdc3nvzZxdqx swqW/ymIROa/Ltdc6qQzDxOnckUNbluhiFr6HRCeQYJrJKTIR/3j+jbNPvw9Ob1ZTEW7rm ZYlAgK/lFM3FBodU6zMIQsIJB1dzUVM= X-MC-Unique: JGjOH9reO2e-uS-uXaPSTQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 3QELjk5oMbmZ_iQOo4HVow-1 From: Jiang Jiacheng To: Subject: [PATCH 4/9] remote: use g_autofree and remove unnecessary label Date: Fri, 6 Jan 2023 17:18:34 +0800 Message-ID: <20230106091839.1263372-5-jiangjiacheng@huawei.com> In-Reply-To: <20230106091839.1263372-1-jiangjiacheng@huawei.com> References: <20230106091839.1263372-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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.2 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: 1672997112719100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: J=C3=A1n Tomko --- 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 12:29:57 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=1672997113; cv=none; d=zohomail.com; s=zohoarc; b=Nma5wMEaOWkDJRVFi5yc2MgJro8SN2xlITfo114bxrg5ExpbebxKGE40O48DRimaDUMy8f05lY/fWB/UPXibDaVI9UWoIDyC4567GGg+L4UwLiReEIo9/7B18NdvWtu4qfYoicBOlV92HBY3O4ViumGcoU+loniqnvxlvMvi5a8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672997113; 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=iY6dadgcL5INWC3pxNPwMVOZXNtayZ5NQ8/nd7aYOEIa3qbGRG5xNe88GLfuJfDhe7D0bFyVdDglLrixzp5XTEFZtmVfesCM8h4UPcUj5/06dZJeaAyxUXLrpSa14b5QUywXxjxOoDmK3TGhs6FIKl9/rqv4BjP2ITgK4ByGxqE= 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 1672997113534187.7345578999891; Fri, 6 Jan 2023 01:25:13 -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-589-EF5YTO5gOiO6oY2AoKkRew-1; Fri, 06 Jan 2023 04:25:07 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DCC85810BCC; Fri, 6 Jan 2023 09:25:01 +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 C46001415304; Fri, 6 Jan 2023 09:25:01 +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 B52081946A6E; Fri, 6 Jan 2023 09:25:01 +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 D13B119465B9 for ; Fri, 6 Jan 2023 09:25:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C37CC1121318; Fri, 6 Jan 2023 09:25:00 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BBEAD1121315 for ; Fri, 6 Jan 2023 09:25:00 +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 9C2D5101A521 for ; Fri, 6 Jan 2023 09:25:00 +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-374-XchcVLcON7Se3pmyoaK7Jw-1; Fri, 06 Jan 2023 04:24:57 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NpHqd3lRWzqV15 for ; Fri, 6 Jan 2023 17:20:13 +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; Fri, 6 Jan 2023 17:24:54 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672997112; 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=DvpS7OrNjnWNxU3VN1miQq+5oPY73rY/18UkFgQfJnnEAg+xDGED+z4ix17wN4PzsCox/g bnW2SlfmkaNezGO025TdCXFMyf1cqmI2KEa7zC1nlELmsblorC/5xeJYpMScP/yN6vy+7k aFVzJYsIJEo98VcNA+6r624qQCePs/s= X-MC-Unique: EF5YTO5gOiO6oY2AoKkRew-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: XchcVLcON7Se3pmyoaK7Jw-1 From: Jiang Jiacheng To: Subject: [PATCH 5/9] rpc: use g_autofree and remove unnecessary label Date: Fri, 6 Jan 2023 17:18:35 +0800 Message-ID: <20230106091839.1263372-6-jiangjiacheng@huawei.com> In-Reply-To: <20230106091839.1263372-1-jiangjiacheng@huawei.com> References: <20230106091839.1263372-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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.7 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: 1672997114721100007 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: J=C3=A1n Tomko --- 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 12:29:57 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=1672997114; cv=none; d=zohomail.com; s=zohoarc; b=HTdcLR8HC69iR1E+2+bKhg624UmSkeEUquFlVqvSNfIHMKzwqymGr8FaSTcpS1t4qBUqkbYJcBqU5PYHhx3Gz53QbWZ9+IL/2CH5hZ11xT08/wh56k9sTE9iyDybEdQQeomcB9rgV2cxd3aZQjkTHU0cS35stKeZDU5Y5xWK1EY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672997114; 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=BrovuYkmvD17FbWQQ0S493gV/wtU9T6dPHo8vDsm8DQ=; b=G42xIQrB1JjFyRyKVt7lC8BjLneayn2RIcXJO0xOHZTnUQrivulJ8WsTRJlmOsevdpArDD70bjFRjL3I6maieXx1aQF0//klj2aZdAG8m5wcAsT0ET2aO/nz8X/FbYC3CaEUyq3izPSAV2KdCEQpdMEM17Cwoi+g3qTNaE6my0I= 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 1672997114288631.1494496548479; Fri, 6 Jan 2023 01:25:14 -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-577-OBEesKV-MjasImT927KwzQ-1; Fri, 06 Jan 2023 04:25:07 -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 4845E858902; Fri, 6 Jan 2023 09:25:02 +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 248581121331; Fri, 6 Jan 2023 09:25:02 +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 113591946A6B; Fri, 6 Jan 2023 09:25:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 47E2D19465A4 for ; Fri, 6 Jan 2023 09:25:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3B741492B00; Fri, 6 Jan 2023 09:25:01 +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 3036A492B01 for ; Fri, 6 Jan 2023 09:25:01 +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 14FA485C082 for ; Fri, 6 Jan 2023 09:25:01 +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-197-U47ECSRbP4uFENcUIRz_rQ-1; Fri, 06 Jan 2023 04:24:58 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NpHvL2wmGznV7n for ; Fri, 6 Jan 2023 17:23: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; Fri, 6 Jan 2023 17:24:54 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672997113; 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=BrovuYkmvD17FbWQQ0S493gV/wtU9T6dPHo8vDsm8DQ=; b=hvNnwh8eiYfiVhKNeo9br8AFO4VMHO4S8BjutFzNhW/ha+XOfHX27ijP2suWArCJ7RaWuO HK71Aw0AzxIuqOOEbBbvKczf5n08kmbAc8DPG0NL/hPrNg9dmSlyeMbxr9lPUHhs3W2rhO khTmnWwbFXjgP2gzU7QmU6ER9L8qyCk= X-MC-Unique: OBEesKV-MjasImT927KwzQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: U47ECSRbP4uFENcUIRz_rQ-1 From: Jiang Jiacheng To: Subject: [PATCH V2 6/9] security: use g_autofree and remove unnecessary label Date: Fri, 6 Jan 2023 17:18:36 +0800 Message-ID: <20230106091839.1263372-7-jiangjiacheng@huawei.com> In-Reply-To: <20230106091839.1263372-1-jiangjiacheng@huawei.com> References: <20230106091839.1263372-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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.10 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: 1672997114778100013 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: J=C3=A1n Tomko --- src/security/security_apparmor.c | 94 +++++++++++--------------------- 1 file changed, 31 insertions(+), 63 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 36e8ce42b5..b63b248975 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 @@ -474,35 +457,30 @@ AppArmorGetSecurityProcessLabel(virSecurityManager *m= gr G_GNUC_UNUSED, pid_t pid G_GNUC_UNUSED, virSecurityLabelPtr sec) { - 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 @@ -554,8 +532,7 @@ static int 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 +540,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 +549,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(). @@ -599,9 +572,8 @@ AppArmorSetSecurityChildProcessLabel(virSecurityManager= *mgr G_GNUC_UNUSED, virDomainDef *def, 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 +587,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 12:29:57 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=1672997116; cv=none; d=zohomail.com; s=zohoarc; b=MvNCEpVwcth09zBiyyicpvg+f3KxM7XF5FPI4296Vi2y/c0MeqHlHwLoYBjnyAwa/h83I0LTeLLfqgLynVOXRAvufisEafBS1zCKNiP/gdvYqirWIAsvxjQvohCQMwrTG3rp4M8eySnz6RiwgFfTCLLCjKWdaCHggFeOAhqbxRM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672997116; 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=TzWaJqcV0j4jd8UNk6qeSZEjpVxPB+i3ZPatXnyCYac86XAi+mgXTx/YVa8in2sFHcRkCMSG+4mXFjJTLZppTgRgK5x43eHMGp6xAX00cDgmSr5kU6xgi1+Li1TgRnd/n6Nt+RRKtiGwvpKJ7kwX6WZsdmKpavVGILIsFNWKBkc= 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 1672997116855657.1991187337086; Fri, 6 Jan 2023 01:25:16 -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-324-yB4ySivsO0unasOgH1Undw-1; Fri, 06 Jan 2023 04:25:06 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 974E129324AE; Fri, 6 Jan 2023 09:25:02 +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 6CEE3492D8B; Fri, 6 Jan 2023 09:25:02 +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 506B31946A75; Fri, 6 Jan 2023 09:25:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0AA141946A73 for ; Fri, 6 Jan 2023 09:25:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EFB5B49BB6A; Fri, 6 Jan 2023 09:25:00 +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 E3D83483EC3 for ; Fri, 6 Jan 2023 09:25:00 +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 C5CBD3813F36 for ; Fri, 6 Jan 2023 09:25:00 +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-206-np29GLn0OIei2fw324_Z1Q-1; Fri, 06 Jan 2023 04:24:58 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NpHvF089NzRr0Q for ; Fri, 6 Jan 2023 17:23:21 +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; Fri, 6 Jan 2023 17:24:55 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672997115; 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=go8yJTmLpAHWM20OuJjnxy+DjU0G1XmfjqCfSUs+dVY3p0KWBWPUmfyzXxJIW7iZlvwAzL LP+WGIosiRmRmkbAIV8To6+HuIP990EVASKMuECbNVNygaGIcq0XkedCMUUaGbrjM1CO0h OOvufAszIlEw6w/Wfj86ek9/BfMXngw= X-MC-Unique: yB4ySivsO0unasOgH1Undw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: np29GLn0OIei2fw324_Z1Q-1 From: Jiang Jiacheng To: Subject: [PATCH 7/9] util: use g_autofree and remove unnecessary label Date: Fri, 6 Jan 2023 17:18:37 +0800 Message-ID: <20230106091839.1263372-8-jiangjiacheng@huawei.com> In-Reply-To: <20230106091839.1263372-1-jiangjiacheng@huawei.com> References: <20230106091839.1263372-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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.10 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.10 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: 1672997118736100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: J=C3=A1n Tomko --- 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 12:29:57 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=1672997114; cv=none; d=zohomail.com; s=zohoarc; b=WbgsSfSTQ00XaLIh7Hd90XlbaG05+X+m7Y2yuPCuKbT+0Me86PMhi8x34TtXfTx4kiLknbplL4gGb7xaVGdGKllkCtNwJMV8bs3Ckuf2kvJAGK9hA/u0sJLExc8VyRFXP5LPpR9XAICB8oz61bF7iS7GTJHFiIP3goq8fXdV62U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672997114; 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=OGTl0Mp+bEposKhc3vTUfI+Hzym+j3qathp+ydWq9GAO2shU3Tzs+saMtnd7rrPWJAf3G0hYTLmR35Ef01zQmrhGIE/50RtCntCO+fEszWN8oLkfvfxWO+CHnjCuj8+eHvkEZ3nF5e4jIZ0xlSLZ1cJm0T+CNx9VCwMREQ3YbAY= 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 1672997114104697.2352337965183; Fri, 6 Jan 2023 01:25:14 -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-141-RlSwv1tWNcmHMMRwF1GtLw-1; Fri, 06 Jan 2023 04:25:10 -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 1F26B805563; Fri, 6 Jan 2023 09:25:06 +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 F1F4A2026D4B; Fri, 6 Jan 2023 09:25:05 +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 9DB391946A71; Fri, 6 Jan 2023 09:25:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9B2971946A6D for ; Fri, 6 Jan 2023 09:25:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8E8FC2166B31; Fri, 6 Jan 2023 09:25:02 +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 866272166B35 for ; Fri, 6 Jan 2023 09:25:02 +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 60F261C05B0E for ; Fri, 6 Jan 2023 09:25:02 +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-610-NRWcIploPeWiWo5pD_N3Sg-1; Fri, 06 Jan 2023 04:24:59 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NpHvN03TFz16MYl for ; Fri, 6 Jan 2023 17:23: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; Fri, 6 Jan 2023 17:24:55 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672997113; 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=S0r9goAwETbn1fZNEBKB1Rlh8FEuwbWCVg2WG8aN6nbMvSLvJQZANmoGxRfL6qIUcOT8Dy 2MEJkX3sWnm1FjXHNj0K/hcdyNeSPu/OKJYXFygClHBTA+OOg/4zL6zuzsbSynibAY7t3n Lp37wBknigDbz+fsHkhk1+FOGNDD3q4= X-MC-Unique: RlSwv1tWNcmHMMRwF1GtLw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: NRWcIploPeWiWo5pD_N3Sg-1 From: Jiang Jiacheng To: Subject: [PATCH 8/9] vmware: use g_autofree and remove unnecessary label Date: Fri, 6 Jan 2023 17:18:38 +0800 Message-ID: <20230106091839.1263372-9-jiangjiacheng@huawei.com> In-Reply-To: <20230106091839.1263372-1-jiangjiacheng@huawei.com> References: <20230106091839.1263372-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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.6 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: 1672997114734100008 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: J=C3=A1n Tomko --- 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 12:29:57 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=1672997112; cv=none; d=zohomail.com; s=zohoarc; b=U3JVMX8VLw1sKeUYXuk31dNKpYZHwj7U+8UpE8EUa2k1ex/WIP7vAQIvRRzNP4KGa1s6mTwM8Kgy4g2Rdzs8V5DoysQLJfMU2eVo0mUev+SKQ057paKiyc0edJtVT3e0S6djtPuJ2TqYoDCvpV1aU80Kf7gfuLsqXTQxExpkI+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672997112; 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=h7/9q3ELjS+AgbB3M6DuR/+NIGCHBnqi4rHooVFG0KSgOvoEV7m2go8omjfJg+Im0aG0p5rwc/1EeHF35oaAZvP3gRenIClQ7pl1Y/nBXsWSXCuRASUukfHXV7sIuj8IxXgsgcVVk+RwNw7F8xLlbYI8GEMRZ2Ub3Sxs4kcUI7E= 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 167299711204014.336470126866516; Fri, 6 Jan 2023 01:25:12 -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-246-dPGnrDLsMD2jWbgPqpeKWA-1; Fri, 06 Jan 2023 04:25:08 -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 9824B102F1E1; Fri, 6 Jan 2023 09:25:05 +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 8196A2166B30; Fri, 6 Jan 2023 09:25:05 +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 65AAA19465A3; Fri, 6 Jan 2023 09:25:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4B7F11946A70 for ; Fri, 6 Jan 2023 09:25:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2F8232166B33; Fri, 6 Jan 2023 09:25:02 +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 25CDA2166B30 for ; Fri, 6 Jan 2023 09:25:02 +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 EEF8B1818E52 for ; Fri, 6 Jan 2023 09:25:01 +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-646-SbdlfLa7MLKJpexwZMK42A-1; Fri, 06 Jan 2023 04:24:59 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NpHqg1MlkzqV0q for ; Fri, 6 Jan 2023 17:20:15 +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; Fri, 6 Jan 2023 17:24:56 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672997111; 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=EWYR3WOvkGl0nFWk/bCtOAZaK81QciCHTwPRY6R0yeKxxzusqcmckrsSzbRWam6CQskOC1 K2nEncCD1BK5ksq5eqKRhtRiJT9FiYfbwB2F41x2hU4yP4qXtjbUldgt066R/nIe1xus+H uP5REmzCiWo+/rkG3asvZqJtkPGjhUY= X-MC-Unique: dPGnrDLsMD2jWbgPqpeKWA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: SbdlfLa7MLKJpexwZMK42A-1 From: Jiang Jiacheng To: Subject: [PATCH 9/9] vz: use g_autofree and remove unnecessary label Date: Fri, 6 Jan 2023 17:18:39 +0800 Message-ID: <20230106091839.1263372-10-jiangjiacheng@huawei.com> In-Reply-To: <20230106091839.1263372-1-jiangjiacheng@huawei.com> References: <20230106091839.1263372-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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.6 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: 1672997112724100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiang Jiacheng Reviewed-by: J=C3=A1n Tomko --- 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