From nobody Mon Feb 9 01:22:42 2026 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639421033; cv=none; d=zohomail.com; s=zohoarc; b=CWIY1lLmeusbzFbzYy4MeESTkEydULfxMo2lu3OIZsehrK6eweSxKo1ckogTAEWHg3aR5YR3L/zmiBI6KMbU0+t+ii8t0BIkc5aUn70QT9dSxtPRlCtRX10ST9apuuWVxE9B5wYR0iUa3NOO2JKE7L+SlC03sFvhzFD4enGlU98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639421033; 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=6lA1ESJraWRYFgjoxt0EUGwsM+tC1T1/NRO+XL1L5co=; b=MNCWC8fQc+IoRUeD+8JCjYRnWJIwgKe0dWVenaSHT9pgnYD144oPN1dymezxxyXRT57qXcN+mdrew7ByQyXX5Y9eYjMjgGxiormxqkCzdHdEzIz9cK0b1+iaSPv8FC3kR+jv+pTqQQqxnVW91A0GavjEghCyzI/9hA6etSR/Bv4= 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=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.129.124]) by mx.zohomail.com with SMTPS id 1639421033109160.97752029907087; Mon, 13 Dec 2021 10:43:53 -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-527-ZjUfV5jvNE-cU4y49w-BXQ-1; Mon, 13 Dec 2021 13:43:48 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 30D2C1853028; Mon, 13 Dec 2021 18:43:42 +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 1145F5F70B; Mon, 13 Dec 2021 18:43:42 +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 D36224A7CD; Mon, 13 Dec 2021 18:43:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BDIhMUg003872 for ; Mon, 13 Dec 2021 13:43:22 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7E3E860C04; Mon, 13 Dec 2021 18:43:22 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05A5A60C9F for ; Mon, 13 Dec 2021 18:43:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639421032; 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=6lA1ESJraWRYFgjoxt0EUGwsM+tC1T1/NRO+XL1L5co=; b=C0UR/Lh4k5jpthqhalsKdEXGJndygs9LSKtXGv0QxZGNlG0xICyBJHuWoELHJ2pASDE3KP 22wegPTQvtZy645ZzreqnQh44kl0/QDkkZy8UmiqhBh1OmHachV5UiwY3bO4xXZ7FCHFcn 5U2U+zsvF1jeD73re8hNB7uu890sKxw= X-MC-Unique: ZjUfV5jvNE-cU4y49w-BXQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 09/20] openvz: refactor openvzConnectListDefinedDomains Date: Mon, 13 Dec 2021 19:43:01 +0100 Message-Id: <55c3f9701878cbdddf0616ad96d6cbaa53402aba.1639420923.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.16 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: 1639421033556100005 Signed-off-by: J=C3=A1n Tomko --- src/openvz/openvz_driver.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index fa5ded54ec..f1ee540a8b 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1382,22 +1382,23 @@ static int openvzConnectNumOfDomains(virConnectPtr = conn) static int openvzConnectListDefinedDomains(virConnectPtr conn G_GNUC_UNUSE= D, char **const names, int nnames)= { int got =3D 0; - int veid, outfd =3D -1, ret; - int rc =3D -1; - char vpsname[32]; - char buf[32]; - char *endptr; - virCommand *cmd =3D virCommandNewArgList(VZLIST, - "-ovpsid", "-H", "-S", NULL); + VIR_AUTOCLOSE outfd =3D -1; + int ret =3D -1; + g_autoptr(virCommand) cmd =3D virCommandNewArgList(VZLIST, + "-ovpsid", "-H", "-S"= , NULL); =20 /* the -S options lists only stopped domains */ virCommandSetOutputFD(cmd, &outfd); if (virCommandRunAsync(cmd, NULL) < 0) - goto out; + goto cleanup; =20 while (got < nnames) { - ret =3D openvz_readline(outfd, buf, 32); - if (!ret) + char vpsname[32]; + char buf[32]; + char *endptr; + int veid; + + if (openvz_readline(outfd, buf, 32) =3D=3D 0) break; if (virStrToLong_i(buf, &endptr, 10, &veid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1405,27 +1406,24 @@ static int openvzConnectListDefinedDomains(virConne= ctPtr conn G_GNUC_UNUSED, continue; } g_snprintf(vpsname, sizeof(vpsname), "%d", veid); - names[got] =3D g_strdup(vpsname); - got ++; + names[got++] =3D g_strdup(vpsname); } =20 if (virCommandWait(cmd, NULL) < 0) - goto out; + goto cleanup; =20 if (VIR_CLOSE(outfd) < 0) { virReportSystemError(errno, "%s", _("failed to close file")); - goto out; + goto cleanup; } =20 - rc =3D got; - out: - VIR_FORCE_CLOSE(outfd); - virCommandFree(cmd); - if (rc < 0) { + ret =3D got; + cleanup: + if (ret < 0) { for (; got >=3D 0; got--) VIR_FREE(names[got]); } - return rc; + return ret; } =20 static int openvzGetProcessInfo(unsigned long long *cpuTime, int vpsid) --=20 2.31.1