From nobody Mon Feb 9 00:30:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1622812373; cv=none; d=zohomail.com; s=zohoarc; b=T8M+2xXPHGI7SxEcHtzOVywH1+yOSj1uf6HzJerRgfXmr7UOlMDrkwPRlLpcDClTJtonGnkj6ihKayfJnPMzNyQg/+fxZeoSYPoskqnDsoDZBfWwtRpqffs9+upCTB2XrAP00lmh8TUuKB4+StZnIgIfflJkZqHOZ6BCY9ZHWYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622812373; 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=y5WbYd5cWqwcnki+UGcT01pMXgDi/7uzRkk0zhuiM+s=; b=UNotXtr9c8WhLyBbu/MDfmiXx7T4nxHpSBSjP9P4a6L3XK4BGSkiyOqrQO9azQUCcn9IYNfoqbtgoIhmL+AGeYdB6ZNxN1MR3jY1oysiriz9Z3J4lGvIB2dkGhzYKJ9/q2beMCTDqKpQJf+yCyVJQNdoCDKYmtUjKvbwBS8RFYM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622812373798703.402420210086; Fri, 4 Jun 2021 06:12:53 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-369-5JOOrDwvOA6UAQnJLzCdKA-1; Fri, 04 Jun 2021 09:12:50 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2ABE10082E0; Fri, 4 Jun 2021 13:12:44 +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 9B32119C79; Fri, 4 Jun 2021 13:12:44 +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 5F76644A59; Fri, 4 Jun 2021 13:12:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 154DAq00026540 for ; Fri, 4 Jun 2021 09:10:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id F10245C26D; Fri, 4 Jun 2021 13:10:52 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 758FB5C1C5 for ; Fri, 4 Jun 2021 13:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622812372; 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=y5WbYd5cWqwcnki+UGcT01pMXgDi/7uzRkk0zhuiM+s=; b=Du5qDFGDF7iIWdKly5yS5ms1Apoqlv3s7Ajv50u0YcZ83+OuhIcfW1YIKk4z1wQJAKiGcO BXci0iC6p/5JIpFpE3ckWIweXoStEXti32RWiweeiCIIR2/UfUCg0jReIlTr4ManIC6Vop Srm76T/OH1UeEhkYXzbKZxs2+mCdTdY= X-MC-Unique: 5JOOrDwvOA6UAQnJLzCdKA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/6] ch_conf: Dissolve chExtractVersionInfo() in chExtractVersion() Date: Fri, 4 Jun 2021 15:10:42 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.84 on 10.5.11.23 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" After previous patches, there's not much value in chExtractVersion(). Rename chExtractVersionInfo() to chExtractVersion() and have it use virCHDriver directly. Signed-off-by: Michal Privoznik --- src/ch/ch_conf.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index 706e5f0ba4..dfebc8525a 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -191,8 +191,8 @@ virCHDriverConfigDispose(void *obj) =20 #define MIN_VERSION ((15 * 1000000) + (0 * 1000) + (0)) =20 -static int -chExtractVersionInfo(int *retversion) +int +chExtractVersion(virCHDriver *driver) { int ret =3D -1; unsigned long version; @@ -201,8 +201,6 @@ chExtractVersionInfo(int *retversion) g_autofree char *ch_cmd =3D g_find_program_in_path(CH_CMD); virCommand *cmd =3D virCommandNewArgList(ch_cmd, "--version", NULL); =20 - *retversion =3D 0; - virCommandAddEnvString(cmd, "LC_ALL=3DC"); virCommandSetOutputBuffer(cmd, &help); =20 @@ -230,22 +228,10 @@ chExtractVersionInfo(int *retversion) goto cleanup; } =20 - *retversion =3D version; + driver->version =3D version; ret =3D 0; =20 cleanup: virCommandFree(cmd); - return ret; } - -int chExtractVersion(virCHDriver *driver) -{ - if (driver->version > 0) - return 0; - - if (chExtractVersionInfo(&driver->version) < 0) - return -1; - - return 0; -} --=20 2.31.1