From nobody Mon Feb 9 01:22:51 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=1639421039; cv=none; d=zohomail.com; s=zohoarc; b=hLeLaw2Z+/eN9HJjegqCLhAYhLPIzZvLR20/V24zS6S4qvQNoi/OMbs3WJnLOGoS86gCztZb+JwpYIuDTa+Q5GuWgUQRgJs3f5gYAe7dzW1HoyI1llgQLTso2d2YCPlgYqVjvzengtxKVCeyAhzyJCS6JjiWife3evDmApBpTL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639421039; 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=HDwVzT3rKVz5b2nCoT53xSbifv0DwsIDwQEjMubq2/A=; b=DktQQ1yi0KLX4UV0kceehxariSIiEgw6+Sj+DF6xlvGBNmAonGIYBTkBpDwDsx1/SdICv+P+LNwMFAkRluoxD/pS3I8/Gl6OA/4xwUK9Y2UAfoNlOneWMRtEeFSlO71ETYddaYxjAGwSmtRLHJmF7jEsZ2MCJn+AZWcogQ1dUtE= 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 1639421039569864.2751923399906; Mon, 13 Dec 2021 10:43: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-421-wV-XucRxPo668OcC27lTtA-1; Mon, 13 Dec 2021 13:43:56 -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 C4CDE64A7C; Mon, 13 Dec 2021 18:43:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7C6C9610AE; Mon, 13 Dec 2021 18:43:48 +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 4191B1806D2B; Mon, 13 Dec 2021 18:43:48 +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 1BDIhNTx003879 for ; Mon, 13 Dec 2021 13:43:23 -0500 Received: by smtp.corp.redhat.com (Postfix) id 504976107F; Mon, 13 Dec 2021 18:43:23 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC8BE60C04 for ; Mon, 13 Dec 2021 18:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639421038; 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=HDwVzT3rKVz5b2nCoT53xSbifv0DwsIDwQEjMubq2/A=; b=UTFDK7OVoLXg7Ps/A9h8zmQ3oTdzupyjn3lh/0TIh95cZlrCo1oxceZgERyTIBrczx3yAO j/PBmB7pDRjQOo5UqoyTWSGRBQxkhIoWgUnwTLYCB7FLrC3kxmg3XLPxmUgfl0SpnfbeQL aa8P5g13E5TkyjQVm5PeZi9YBYs7qyQ= X-MC-Unique: wV-XucRxPo668OcC27lTtA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 10/20] openvz: refactor openvzDomainGetBarrierLimit Date: Mon, 13 Dec 2021 19:43:02 +0100 Message-Id: <6daa8f4dea3cc927022c84fe126cd3eb5763642d.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.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: 1639421041181100005 Signed-off-by: J=C3=A1n Tomko --- src/openvz/openvz_driver.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index f1ee540a8b..345c31304a 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1515,37 +1515,33 @@ openvzDomainGetBarrierLimit(virDomainPtr domain, unsigned long long *barrier, unsigned long long *limit) { - int ret =3D -1; - char *endp, *output =3D NULL; + char *endp; + g_autofree char *output =3D NULL; const char *tmp; - virCommand *cmd =3D virCommandNewArgList(VZLIST, "--no-header", NULL); + g_autoptr(virCommand) cmd =3D virCommandNewArgList(VZLIST, "--no-heade= r", NULL); =20 virCommandSetOutputBuffer(cmd, &output); virCommandAddArgFormat(cmd, "-o%s.b,%s.l", param, param); virCommandAddArg(cmd, domain->name); if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + return -1; =20 tmp =3D output; virSkipSpaces(&tmp); if (virStrToLong_ull(tmp, &endp, 10, barrier) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Can't parse limit from vzlist output '%s'"), out= put); - goto cleanup; + return -1; } tmp =3D endp; virSkipSpaces(&tmp); if (virStrToLong_ull(tmp, &endp, 10, limit) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Can't parse barrier from vzlist output '%s'"), o= utput); - goto cleanup; + return -1; } =20 - ret =3D 0; - cleanup: - VIR_FREE(output); - virCommandFree(cmd); - return ret; + return 0; } =20 =20 --=20 2.31.1