From nobody Sun Feb 8 15:53:32 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=1617808249; cv=none; d=zohomail.com; s=zohoarc; b=XYzEQm9xVh1jW23N6qWMDjdWF1mJakGS+CxPoAaDr5SGRMNEbdNlg8upQvoy/fbtSXEFyQf0c+R5OOFVuCyoyhK9YsQgujQFfMyN7ZAYTya0fA1ww+2LyfIhnpbsxdaZa/PEpHKM5Cl7+ilsdaFQS5jsRQd07nOtJHMT4OI/MEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617808249; 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=mTxCv2P+yq+gTMfsuuFPswiPbDCXR8vY4yRU6AukcjI=; b=RHWfGLbhGQ2mTwcv/bxy58M1bYE8Yz4kZs65UCM1/IsTwET0xt4XJt/Rx8fc145I03dbJyT0KEqW91RTr2RUcizAvbUe8fXtL7muNoIaD2ZRk7rsYXYzamlWksfMQt1YragMbjCHMSSQAj9XNUbNB2sXs8P+KfKcpPYmSeTzLlg= 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 1617808249557549.6428032504789; Wed, 7 Apr 2021 08:10:49 -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-419-0ehq2wNuOAu9RirmVTB_UQ-1; Wed, 07 Apr 2021 11:10:45 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D0D3107ACCA; Wed, 7 Apr 2021 15:10:38 +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 49DA060C5C; Wed, 7 Apr 2021 15:10:38 +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 094475533F; Wed, 7 Apr 2021 15:10:38 +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 137FAan0032108 for ; Wed, 7 Apr 2021 11:10:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7D29019D9F; Wed, 7 Apr 2021 15:10:36 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8EDB19D7D for ; Wed, 7 Apr 2021 15:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617808248; 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=mTxCv2P+yq+gTMfsuuFPswiPbDCXR8vY4yRU6AukcjI=; b=D7A7KSnGGM3Qd7scxUqUVdMqKjuzsWSLgtdLlDMnx8RM0F+OO2FhMvJGi4IUggRnPcaiof XiLh055Kf/RmHXK3A++QEG1I+FP/WQfAi5C4ltGnB14qdWnuNZgaf9mkGuOjZZ55G8ajPT oSbR+yOEBzKRPqdHDQeFzhrNNaVL+QI= X-MC-Unique: 0ehq2wNuOAu9RirmVTB_UQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 18/24] storage: Format mount options before positional arguments Date: Wed, 7 Apr 2021 17:09:41 +0200 Message-Id: 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.13 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" Move calls to virStorageBackendFileSystemMountAddOptions earlier so that the options are formatted before the positional arguments. Signed-off-by: Peter Krempa --- src/storage/storage_util.c | 8 ++++---- tests/storagepoolxml2argvdata/pool-fs-freebsd.argv | 6 +++++- tests/storagepoolxml2argvdata/pool-fs-linux.argv | 4 +++- .../storagepoolxml2argvdata/pool-netfs-auto-freebsd.argv | 5 ++++- tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv | 3 ++- .../storagepoolxml2argvdata/pool-netfs-cifs-freebsd.argv | 6 +++++- tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv | 4 +++- tests/storagepoolxml2argvdata/pool-netfs-cifs.argv | 6 +++++- tests/storagepoolxml2argvdata/pool-netfs-freebsd.argv | 6 +++++- .../pool-netfs-gluster-freebsd.argv | 7 +++++-- .../storagepoolxml2argvdata/pool-netfs-gluster-linux.argv | 5 +++-- tests/storagepoolxml2argvdata/pool-netfs-gluster.argv | 6 +++++- tests/storagepoolxml2argvdata/pool-netfs-linux.argv | 4 +++- .../pool-netfs-ns-mountopts-freebsd.argv | 7 +++++-- .../pool-netfs-ns-mountopts-linux.argv | 5 +++-- .../storagepoolxml2argvdata/pool-netfs-ns-mountopts.argv | 6 +++++- .../pool-netfs-protocol-ver-freebsd.argv | 6 +++++- .../pool-netfs-protocol-ver-linux.argv | 5 +++-- .../storagepoolxml2argvdata/pool-netfs-protocol-ver.argv | 6 +++++- 19 files changed, 78 insertions(+), 27 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 687bc645ee..6cf6753ef3 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -4140,8 +4140,8 @@ virStorageBackendFileSystemMountNFSArgs(virCommandPtr= cmd, virStoragePoolDefPtr def, const char *nfsVers) { - virCommandAddArgList(cmd, src, def->target.path, NULL); virStorageBackendFileSystemMountAddOptions(cmd, def, nfsVers); + virCommandAddArgList(cmd, src, def->target.path, NULL); } @@ -4153,8 +4153,8 @@ virStorageBackendFileSystemMountGlusterArgs(virComman= dPtr cmd, const char *fmt; fmt =3D virStoragePoolFormatFileSystemNetTypeToString(def->source.form= at); - virCommandAddArgList(cmd, "-t", fmt, src, def->target.path, NULL); virStorageBackendFileSystemMountAddOptions(cmd, def, "direct-io-mode= =3D1"); + virCommandAddArgList(cmd, "-t", fmt, src, def->target.path, NULL); } @@ -4166,8 +4166,8 @@ virStorageBackendFileSystemMountCIFSArgs(virCommandPt= r cmd, const char *fmt; fmt =3D virStoragePoolFormatFileSystemNetTypeToString(def->source.form= at); - virCommandAddArgList(cmd, "-t", fmt, src, def->target.path, NULL); virStorageBackendFileSystemMountAddOptions(cmd, def, "guest"); + virCommandAddArgList(cmd, "-t", fmt, src, def->target.path, NULL); } @@ -4183,8 +4183,8 @@ virStorageBackendFileSystemMountDefaultArgs(virComman= dPtr cmd, fmt =3D virStoragePoolFormatFileSystemTypeToString(def->source.for= mat); else fmt =3D virStoragePoolFormatFileSystemNetTypeToString(def->source.= format); - virCommandAddArgList(cmd, "-t", fmt, src, def->target.path, NULL); virStorageBackendFileSystemMountAddOptions(cmd, def, nfsVers); + virCommandAddArgList(cmd, "-t", fmt, src, def->target.path, NULL); } diff --git a/tests/storagepoolxml2argvdata/pool-fs-freebsd.argv b/tests/sto= ragepoolxml2argvdata/pool-fs-freebsd.argv index a35d73e254..19dac7599e 100644 --- a/tests/storagepoolxml2argvdata/pool-fs-freebsd.argv +++ b/tests/storagepoolxml2argvdata/pool-fs-freebsd.argv @@ -1 +1,5 @@ -mount -t ext3 /dev/sda6 /mnt -o nosuid,noexec +mount \ +-o nosuid,noexec \ +-t ext3 \ +/dev/sda6 \ +/mnt diff --git a/tests/storagepoolxml2argvdata/pool-fs-linux.argv b/tests/stora= gepoolxml2argvdata/pool-fs-linux.argv index 19543f442d..6d014320cf 100644 --- a/tests/storagepoolxml2argvdata/pool-fs-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-fs-linux.argv @@ -1 +1,3 @@ -mount -t ext3 /dev/sda6 /mnt -o nodev,nosuid,noexec +mount \ +-o nodev,nosuid,noexec \ +-t ext3 /dev/sda6 /mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-auto-freebsd.argv b/t= ests/storagepoolxml2argvdata/pool-netfs-auto-freebsd.argv index 39e5c97aed..8ef4527680 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-auto-freebsd.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-auto-freebsd.argv @@ -1 +1,4 @@ -mount localhost:/var/lib/libvirt/images /mnt -o nosuid,noexec +mount \ +-o nosuid,noexec \ +localhost:/var/lib/libvirt/images \ +/mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv b/tes= ts/storagepoolxml2argvdata/pool-netfs-auto-linux.argv index 1f82d3d29c..b5e455090a 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-auto-linux.argv @@ -1 +1,2 @@ -mount localhost:/var/lib/libvirt/images /mnt -o nodev,nosuid,noexec +mount \ +-o nodev,nosuid,noexec localhost:/var/lib/libvirt/images /mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-cifs-freebsd.argv b/t= ests/storagepoolxml2argvdata/pool-netfs-cifs-freebsd.argv index d72749a032..fe4b4dbe35 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-cifs-freebsd.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-cifs-freebsd.argv @@ -1 +1,5 @@ -mount -t cifs //example.com/samba_share /mnt/cifs -o nosuid,noexec,guest +mount \ +-o nosuid,noexec,guest \ +-t cifs \ +//example.com/samba_share \ +/mnt/cifs diff --git a/tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv b/tes= ts/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv index 85aa9cf23f..feb20d7bc8 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-cifs-linux.argv @@ -1 +1,3 @@ -mount -t cifs //example.com/samba_share /mnt/cifs -o nodev,nosuid,noexec,g= uest +mount \ +-o nodev,nosuid,noexec,guest \ +-t cifs //example.com/samba_share /mnt/cifs diff --git a/tests/storagepoolxml2argvdata/pool-netfs-cifs.argv b/tests/sto= ragepoolxml2argvdata/pool-netfs-cifs.argv index 2fef6f5782..1e9eeb467b 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-cifs.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-cifs.argv @@ -1 +1,5 @@ -mount -t cifs //example.com/samba_share /mnt/cifs -o guest +mount \ +-o guest \ +-t cifs \ +//example.com/samba_share \ +/mnt/cifs diff --git a/tests/storagepoolxml2argvdata/pool-netfs-freebsd.argv b/tests/= storagepoolxml2argvdata/pool-netfs-freebsd.argv index 05c1951f32..15efc94531 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-freebsd.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-freebsd.argv @@ -1 +1,5 @@ -mount -t nfs localhost:/var/lib/libvirt/images /mnt -o nosuid,noexec +mount \ +-o nosuid,noexec \ +-t nfs \ +localhost:/var/lib/libvirt/images \ +/mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-gluster-freebsd.argv = b/tests/storagepoolxml2argvdata/pool-netfs-gluster-freebsd.argv index 700107d78e..38dfabdaab 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-gluster-freebsd.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-gluster-freebsd.argv @@ -1,2 +1,5 @@ -mount -t glusterfs example.com:/volume /mnt/gluster -o nosuid,noexec,\ -direct-io-mode=3D1 +mount \ +-o nosuid,noexec,direct-io-mode=3D1 \ +-t glusterfs \ +example.com:/volume \ +/mnt/gluster diff --git a/tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv b/= tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv index 9535c8a1b9..4524bc921a 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-gluster-linux.argv @@ -1,2 +1,3 @@ -mount -t glusterfs example.com:/volume /mnt/gluster -o nodev,nosuid,noexec= ,\ -direct-io-mode=3D1 +mount \ +-o nodev,nosuid,noexec,direct-io-mode=3D1 \ +-t glusterfs example.com:/volume /mnt/gluster diff --git a/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv b/tests/= storagepoolxml2argvdata/pool-netfs-gluster.argv index 97be9cbeb3..ec9a09defe 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv @@ -1 +1,5 @@ -mount -t glusterfs example.com:/volume /mnt/gluster -o direct-io-mode=3D1 +mount \ +-o direct-io-mode=3D1 \ +-t glusterfs \ +example.com:/volume \ +/mnt/gluster diff --git a/tests/storagepoolxml2argvdata/pool-netfs-linux.argv b/tests/st= oragepoolxml2argvdata/pool-netfs-linux.argv index 22fafd7b32..ce0d88cfac 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-linux.argv @@ -1 +1,3 @@ -mount -t nfs localhost:/var/lib/libvirt/images /mnt -o nodev,nosuid,noexec +mount \ +-o nodev,nosuid,noexec \ +-t nfs localhost:/var/lib/libvirt/images /mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-freebsd.= argv b/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-freebsd.argv index ac5c0acd00..b90811e0fd 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-freebsd.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-freebsd.argv @@ -1,2 +1,5 @@ -mount -t nfs localhost:/var/lib/libvirt/images /mnt -o nosuid,noexec,nfsve= rs=3D3,\ -sync,lazytime +mount \ +-o nosuid,noexec,nfsvers=3D3,sync,lazytime \ +-t nfs \ +localhost:/var/lib/libvirt/images \ +/mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.ar= gv b/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv index 8e10379c04..517fdbb080 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts-linux.argv @@ -1,2 +1,3 @@ -mount -t nfs localhost:/var/lib/libvirt/images /mnt -o nodev,nosuid,noexec= ,\ -nfsvers=3D3,sync,lazytime +mount \ +-o nodev,nosuid,noexec,nfsvers=3D3,sync,lazytime \ +-t nfs localhost:/var/lib/libvirt/images /mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts.argv b/t= ests/storagepoolxml2argvdata/pool-netfs-ns-mountopts.argv index a63d6da456..0d6d62793d 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts.argv @@ -1 +1,5 @@ -mount -t nfs localhost:/var/lib/libvirt/images /mnt -o nfsvers=3D3,sync,la= zytime +mount \ +-o nfsvers=3D3,sync,lazytime \ +-t nfs \ +localhost:/var/lib/libvirt/images \ +/mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.= argv b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv index 59d09d2e5d..32cdaebcff 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv @@ -1 +1,5 @@ -mount -t nfs localhost:/var/lib/libvirt/images /mnt -o nosuid,noexec,nfsve= rs=3D3 +mount \ +-o nosuid,noexec,nfsvers=3D3 \ +-t nfs \ +localhost:/var/lib/libvirt/images \ +/mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.ar= gv b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv index c819a089d2..fc1d91c614 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv @@ -1,2 +1,3 @@ -mount -t nfs localhost:/var/lib/libvirt/images /mnt -o nodev,nosuid,noexec= ,\ -nfsvers=3D3 +mount \ +-o nodev,nosuid,noexec,nfsvers=3D3 \ +-t nfs localhost:/var/lib/libvirt/images /mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv b/t= ests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv index f26656d5b8..ed157883c0 100644 --- a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv +++ b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv @@ -1 +1,5 @@ -mount -t nfs localhost:/var/lib/libvirt/images /mnt -o nfsvers=3D3 +mount \ +-o nfsvers=3D3 \ +-t nfs \ +localhost:/var/lib/libvirt/images \ +/mnt --=20 2.30.2