From nobody Wed May 14 05:52:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1525783715949752.5369652711029; Tue, 8 May 2018 05:48:35 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 9E71723E6CE; Tue, 8 May 2018 12:48:34 +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 64360608F4; Tue, 8 May 2018 12:48:34 +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 202EC4CAB4; Tue, 8 May 2018 12:48:34 +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 w48CmGW6020597 for ; Tue, 8 May 2018 08:48:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0E5BE2719D; Tue, 8 May 2018 12:48:16 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-94.phx2.redhat.com [10.3.116.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id C14A2272A6 for ; Tue, 8 May 2018 12:48:15 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Tue, 8 May 2018 08:48:03 -0400 Message-Id: <20180508124805.2372-11-jferlan@redhat.com> In-Reply-To: <20180508124805.2372-1-jferlan@redhat.com> References: <20180508124805.2372-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 10/12] storage_util: Move @type into _virStorageBackendQemuImgInfo 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 08 May 2018 12:48:35 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We're about to split up the code a bit more, so we'll need this to be in the local struct. Signed-off-by: John Ferlan --- src/storage/storage_util.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index bd8fb7ca92..c28f427a1a 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -794,6 +794,7 @@ storagePloopResize(virStorageVolDefPtr vol, */ struct _virStorageBackendQemuImgInfo { int format; + const char *type; const char *path; unsigned long long size_arg; unsigned long long allocation; @@ -1125,9 +1126,9 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePo= olObjPtr pool, const char *secretPath) { virCommandPtr cmd =3D NULL; - const char *type; struct _virStorageBackendQemuImgInfo info =3D { .format =3D vol->target.format, + .type =3D NULL, .path =3D vol->target.path, .allocation =3D vol->target.allocation, .encryption =3D !!vol->target.encryption, @@ -1149,7 +1150,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePo= olObjPtr pool, if (info.format =3D=3D VIR_STORAGE_FILE_ISO) info.format =3D VIR_STORAGE_FILE_RAW; =20 - if (!(type =3D virStorageFileFormatTypeToString(info.format))) { + if (!(info.type =3D virStorageFileFormatTypeToString(info.format))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown storage vol type %d"), info.format); @@ -1178,7 +1179,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePo= olObjPtr pool, return NULL; } if (vol->target.encryption->format =3D=3D VIR_STORAGE_ENCRYPTION_F= ORMAT_LUKS) { - type =3D "luks"; + info.type =3D "luks"; } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Only luks encryption is supported for raw fi= les")); @@ -1195,7 +1196,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePo= olObjPtr pool, return NULL; =20 if (info.encryption && - storageBackendCreateQemuImgCheckEncryption(info.format, type, vol)= < 0) + storageBackendCreateQemuImgCheckEncryption(info.format, info.type,= vol) < 0) return NULL; =20 /* Size in KB */ @@ -1209,9 +1210,9 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePo= olObjPtr pool, =20 if (info.inputPath) virCommandAddArgList(cmd, "convert", "-f", info.inputFormatStr, - "-O", type, NULL); + "-O", info.type, NULL); else - virCommandAddArgList(cmd, "create", "-f", type, NULL); + virCommandAddArgList(cmd, "create", "-f", info.type, NULL); =20 if (info.backingPath) virCommandAddArgList(cmd, "-b", info.backingPath, NULL); --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list