From nobody Mon Feb 9 00:31:20 2026 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.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 149158261797391.07117007709394; Fri, 7 Apr 2017 09:30:17 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DF86C338844; Fri, 7 Apr 2017 16:30:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7E78E18006; Fri, 7 Apr 2017 16:30:14 +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 6C82E4BB75; Fri, 7 Apr 2017 16:30:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v37GUBeL018915 for ; Fri, 7 Apr 2017 12:30:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id E0403189CB; Fri, 7 Apr 2017 16:30:11 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-19.phx2.redhat.com [10.3.116.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F72C857B9 for ; Fri, 7 Apr 2017 16:30:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DF86C338844 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com DF86C338844 From: John Ferlan To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 12:30:03 -0400 Message-Id: <20170407163007.17702-2-jferlan@redhat.com> In-Reply-To: <20170407163007.17702-1-jferlan@redhat.com> References: <20170407163007.17702-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 1/5] storage: Modify storageBackendWipeLocal to allow zero from end of device 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 07 Apr 2017 16:30:16 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add bool 'zero_end' and logic that would allow a caller to wipe specific portions of a target device either from the beginning (the default) or from the end when zero_end is true. This will allow for this code to wipe out partition table information from a device. Signed-off-by: John Ferlan --- src/storage/storage_util.c | 48 +++++++++++++++++++++++++++++++++---------= ---- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index a2d89af..c1734e7 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2516,24 +2516,44 @@ static int storageBackendWipeLocal(const char *path, int fd, unsigned long long wipe_len, - size_t writebuf_length) + size_t writebuf_length, + bool zero_end) { int ret =3D -1, written =3D 0; unsigned long long remaining =3D 0; + off_t size; size_t write_size =3D 0; char *writebuf =3D NULL; =20 - VIR_DEBUG("wiping start: 0 len: %llu", wipe_len); - if (VIR_ALLOC_N(writebuf, writebuf_length) < 0) goto cleanup; =20 - if (lseek(fd, 0, SEEK_SET) < 0) { - virReportSystemError(errno, - _("Failed to seek to the start in volume " - "with path '%s'"), - path); - goto cleanup; + if (!zero_end) { + if (lseek(fd, 0, SEEK_SET) < 0) { + virReportSystemError(errno, + _("Failed to seek to the start in volume " + "with path '%s'"), + path); + goto cleanup; + } + VIR_DEBUG("wiping start: 0 len: %llu", wipe_len); + } else { + if ((size =3D lseek(fd, 0, SEEK_END)) =3D=3D (off_t)-1) { + virReportSystemError(errno, + _("Failed to seek to the end in volume " + "with path '%s'"), + path); + goto cleanup; + } + size -=3D wipe_len; + if (lseek(fd, size, SEEK_SET) < 0) { + virReportSystemError(errno, + _("Failed to seek to %zd bytes in volume " + "with path '%s'"), + size, path); + goto cleanup; + } + VIR_DEBUG("wiping start: %zd len: %llu", size, wipe_len); } =20 remaining =3D wipe_len; @@ -2573,7 +2593,8 @@ storageBackendWipeLocal(const char *path, static int storageBackendVolWipeLocalFile(const char *path, unsigned int algorithm, - unsigned long long allocation) + unsigned long long allocation, + bool zero_end) { int ret =3D -1, fd =3D -1; const char *alg_char =3D NULL; @@ -2648,7 +2669,8 @@ storageBackendVolWipeLocalFile(const char *path, if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)= ) { ret =3D storageBackendVolZeroSparseFileLocal(path, st.st_size,= fd); } else { - ret =3D storageBackendWipeLocal(path, fd, allocation, st.st_bl= ksize); + ret =3D storageBackendWipeLocal(path, fd, allocation, st.st_bl= ksize, + zero_end); } if (ret < 0) goto cleanup; @@ -2686,7 +2708,7 @@ storageBackendVolWipePloop(virStorageVolDefPtr vol, goto cleanup; =20 if (storageBackendVolWipeLocalFile(target_path, algorithm, - vol->target.allocation) < 0) + vol->target.allocation, false) < 0) goto cleanup; =20 if (virFileRemove(disk_desc, 0, 0) < 0) { @@ -2735,7 +2757,7 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTR= IBUTE_UNUSED, ret =3D storageBackendVolWipePloop(vol, algorithm); } else { ret =3D storageBackendVolWipeLocalFile(vol->target.path, algorithm, - vol->target.allocation); + vol->target.allocation, false= ); } =20 return ret; --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list