From nobody Sun Feb 8 18:08:47 2026 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639404059; cv=none; d=zohomail.com; s=zohoarc; b=QMf0m+uHt02OB3mjiEyiV+ij5FSfWVyjPU3vIlGzrusMoHT+FMCJvZfcw0JJB32QJqPwwHVHZLZptJHjWJr72uoMt/alYF1EfodVQoHWrmj/VWGzcWqx7G8ae+vhs3la9zlY5/bN5Ul5F5EckSXtY7EJ9ff6cokbNiMxXqE+PZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639404059; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GzSL9sY5HfhAj803COkGGWSB1+tSorCg3g3i54gkO3E=; b=OwtQPllL6wfbWF3BcT70X03tdJkOH57r4lzVoPfCNiTtdW3Fcg80pPYDR7HNFdG6iGL6kct70zrmL8vmNQlU8blGZvUa5gkiU+0QthZTEVHUbagKOB+lOVw+vGgKRSrwOX3kVxEigOzGozft0unp7fzqrb/Mr49hhQqCqmCizRk= 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=pass header.from= (p=none dis=none) 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 1639404059690538.5828677688966; Mon, 13 Dec 2021 06:00:59 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-562-ILiWO55aPACjM5Y9mREU5Q-1; Mon, 13 Dec 2021 09:00:54 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 31B1A8015CD; Mon, 13 Dec 2021 14:00:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 110BA610AE; Mon, 13 Dec 2021 14:00:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D71804A717; Mon, 13 Dec 2021 14:00:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BDDxroF002572 for ; Mon, 13 Dec 2021 08:59:53 -0500 Received: by smtp.corp.redhat.com (Postfix) id 44EE316A31; Mon, 13 Dec 2021 13:59:53 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF4E016A32 for ; Mon, 13 Dec 2021 13:59:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639404058; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=GzSL9sY5HfhAj803COkGGWSB1+tSorCg3g3i54gkO3E=; b=Oyy9Wmzh+R4iRnxMvFcX31Omi/Pi5Uclp8t/+m8hwWjnkpNpZ8jpNu75HY+T7v6pJ6zsl9 t3gASoeWWeZsg4xvJTgolNj8t0OYl3JlAfeBpI/zg/tq+B6jf5g8nc00xqC03sZ+rBMJFN L1Sil41hWOczySCHXqgArBCOVevtmI0= X-MC-Unique: ILiWO55aPACjM5Y9mREU5Q-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 09/14] lxc: refactor virLXCProcessBuildControllerCmd Date: Mon, 13 Dec 2021 14:59:38 +0100 Message-Id: <66146b194b7d3b4d86afe9c5357d597de1cc2aaa.1639403837.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639404072463100003 Use automatic cleanup and remove the labels. Signed-off-by: J=C3=A1n Tomko --- src/lxc/lxc_process.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 625208c86b..118d9cbdcc 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -935,7 +935,7 @@ virLXCProcessBuildControllerCmd(virLXCDriver *driver, size_t i; g_autofree char *filterstr =3D NULL; g_autofree char *outputstr =3D NULL; - virCommand *cmd; + g_autoptr(virCommand) cmd =3D NULL; g_autoptr(virLXCDriverConfig) cfg =3D virLXCDriverGetConfig(driver); =20 cmd =3D virCommandNew(vm->def->emulator); @@ -955,7 +955,7 @@ virLXCProcessBuildControllerCmd(virLXCDriver *driver, if (cfg->log_libvirtd) { if (virLogGetNbOutputs() > 0) { if (!(outputstr =3D virLogGetOutputs())) - goto error; + return NULL; =20 virCommandAddEnvPair(cmd, "LIBVIRT_LOG_OUTPUTS", outputstr); } @@ -1007,12 +1007,7 @@ virLXCProcessBuildControllerCmd(virLXCDriver *driver, * write the live domain status XML with the PID */ virCommandRequireHandshake(cmd); =20 - cleanup: - return cmd; - error: - virCommandFree(cmd); - cmd =3D NULL; - goto cleanup; + return g_steal_pointer(&cmd); } =20 =20 --=20 2.31.1