From nobody Mon May 6 13:23:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1611038182; cv=none; d=zohomail.com; s=zohoarc; b=XrwhL66+DXeZx5scVQcUdBPeaUanLZFNPqXCAi6SkjRDw6F1WP3olE2HIB5RW2mFfO/84JQSP/6MzSr0HppofoaM+Wi7K147aFg975NWhHX+AHVfUKpyoEEldtggxfojcxeW9wDw58UuKvy8Kr2zH8Ru4PeFVqfqulMom/3qGaw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611038182; h=Content-Type:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=FZTwKgbPaZ3UUcX0s/nr6OPV4fCQClLTrnQUApuhvWQ=; b=nULRHHvFc5TGOIfsVANOT7avMa+UlFU6zv10Z/blp8AgyCeohkDXrij/myjTdWLO1IYQC4znuPIdHxVq6bfUJMLFOH3SDu3lvY9JpFs34FKodtnUp0T3mGW9h4r8cDx74+kxuVlmKkG0RzzPFKrUdGLTvaQj0hdP32Gw3bn1B6Y= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1611038182794832.8209646907417; Mon, 18 Jan 2021 22:36:22 -0800 (PST) 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-338-pyq3x_JCNIi3kzb7RRplGg-1; Tue, 19 Jan 2021 01:36:19 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1936710054FF; Tue, 19 Jan 2021 06:36:14 +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 705D15D9D3; Tue, 19 Jan 2021 06:36:11 +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 1F6124BB40; Tue, 19 Jan 2021 06:36:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10J6a1SK028256 for ; Tue, 19 Jan 2021 01:36:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6D7D02166B2E; Tue, 19 Jan 2021 06:36:01 +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 687BD2166B2C for ; Tue, 19 Jan 2021 06:35:58 +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-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6C59E187504B for ; Tue, 19 Jan 2021 06:35:58 +0000 (UTC) Received: from relay3.sw.ru (relay.sw.ru [185.231.240.75]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-496-q6yPmL5bPoi6A472jMQDfA-1; Tue, 19 Jan 2021 01:35:55 -0500 Received: from [10.28.15.168] (helo=vz7.sw.ru.) by relay3.sw.ru with esmtp (Exim 4.94) (envelope-from ) id 1l1kb3-00H1rK-0i for libvir-list@redhat.com; Tue, 19 Jan 2021 09:34:33 +0300 X-MC-Unique: pyq3x_JCNIi3kzb7RRplGg-1 X-MC-Unique: q6yPmL5bPoi6A472jMQDfA-1 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH] vstorage: remove build time checks for runtime binaries Date: Tue, 19 Jan 2021 09:34:31 +0300 Message-Id: <1611038071-897439-1-git-send-email-nshirokovskiy@virtuozzo.com> 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 2.78 on 10.11.54.6 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.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Accoring to current agreement mentioned in list recently [1]. Now vstorage driver will be build in default devs environment and also can be included into CI. This also closes quite old abandoned thread on alternative checks for binaries in case of this same driver [2]. [1] https://www.redhat.com/archives/libvir-list/2021-January/msg00750.html [2] https://www.redhat.com/archives/libvir-list/2020-July/msg00697.html Signed-off-by: Nikolay Shirokovskiy Reviewed-by: Michal Privoznik --- meson.build | 22 ++-------------------- src/storage/storage_backend_vstorage.c | 4 ++-- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/meson.build b/meson.build index b5277b4..e3e7ff7 100644 --- a/meson.build +++ b/meson.build @@ -1957,26 +1957,8 @@ if conf.has('WITH_LIBVIRTD') endif =20 if not get_option('storage_vstorage').disabled() - vstorage_enable =3D true - - foreach name : ['vstorage', 'vstorage-mount', 'umount'] - set_variable( - '@0@_prog'.format(name.underscorify()), - find_program(name, required: get_option('storage_vstorage'), dirs:= libvirt_sbin_path) - ) - if not get_variable('@0@_prog'.format(name.underscorify())).found() - vstorage_enable =3D false - endif - endforeach - - if vstorage_enable - use_storage =3D true - conf.set('WITH_STORAGE_VSTORAGE', 1) - foreach name : ['vstorage', 'vstorage-mount', 'umount'] - path =3D get_variable('@0@_prog'.format(name.underscorify())).path= () - conf.set_quoted(name.to_upper(), path) - endforeach - endif + use_storage =3D true + conf.set('WITH_STORAGE_VSTORAGE', 1) endif =20 if not get_option('storage_zfs').disabled() diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_b= ackend_vstorage.c index 6cff9f1..7c67407 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -65,7 +65,7 @@ virStorageBackendVzPoolStart(virStoragePoolObjPtr pool) =20 mode =3D g_strdup_printf("%o", def->target.perms.mode); =20 - cmd =3D virCommandNewArgList(VSTORAGE_MOUNT, + cmd =3D virCommandNewArgList("vstorage-mount", "-c", def->source.name, def->target.path, "-m", mode, @@ -129,7 +129,7 @@ virStorageBackendVzPoolStop(virStoragePoolObjPtr pool) if ((rc =3D virStorageBackendVzIsMounted(pool)) !=3D 1) return rc; =20 - cmd =3D virCommandNewArgList(UMOUNT, def->target.path, NULL); + cmd =3D virCommandNewArgList("umount", def->target.path, NULL); return virCommandRun(cmd, NULL); } =20 --=20 1.8.3.1