From nobody Mon Feb 9 17:24:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1587720277; cv=none; d=zohomail.com; s=zohoarc; b=TMuzpSeKCZpRE+oPucdfZ4/pn3SGkDGt0yMH0zHDtAqUtN8QyWnpUHkCE5B6/BCC16UGa9+DEqICf2sh8AWPR0BXlZ+XqNezsLIl6d82mkZeQceB4he5kWA59WmqWGUpujnhvm11nYT/rCh+DnH1z+Rgy+p29IIcQKoRZ8FyISk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587720277; 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=XggMa1gtIgOjbssz3bWBkVY9VEK4yz3BLxqWIu7sCaA=; b=jeQNH5/VfrJS2pbiCGN7eoBHEzk2ocR/CxtQL40Vf/GSAdTGEHvt2GzVfvKYlJ0iEInVsfuKnCBzrVmxpoTh5hmI//9xeHY9/dEE9S2iBtVJv7DwS6Yjqdef5V9NIQVhDm1rnFp3NR7OhjGRSNfcpnn7uMvAPMn8YS5Cyvwkdq8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1587720277094300.49083132331907; Fri, 24 Apr 2020 02:24:37 -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-499-Y4HiSYHoMJKpHDAiIaSq6w-1; Fri, 24 Apr 2020 05:24:32 -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 ECFC4100CCCC; Fri, 24 Apr 2020 09:24:26 +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 C20AA4038; Fri, 24 Apr 2020 09:24:26 +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 7DDAE4CAA7; Fri, 24 Apr 2020 09:24:26 +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 03O9OFPT018304 for ; Fri, 24 Apr 2020 05:24:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4DDD860300; Fri, 24 Apr 2020 09:24:15 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id B54E49080 for ; Fri, 24 Apr 2020 09:24:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587720275; 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=XggMa1gtIgOjbssz3bWBkVY9VEK4yz3BLxqWIu7sCaA=; b=KZaaOH9vcoQ75vmR+ZTYq0WRMMKG621XERuN/6NdaLRMZqnhBX68TBMO+r2uH8OMXjX3Y4 tJgMl/Q5JtjlK+/9dUKaImf3st57/BGFunklQi3Ru3Y2Vzz8j32Lc0CWOMaFNPu1WRaG2Z sQkc7Z61xDA6GTgTBbTWRx0GcSRwoqA= X-MC-Unique: Y4HiSYHoMJKpHDAiIaSq6w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/4] util: Remove 'externalDataStoreRaw' field from virStorageSource Date: Fri, 24 Apr 2020 11:24:06 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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 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" It's not used for anything so we don't need to extract it. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/util/virstoragefile.c | 14 ++------------ src/util/virstoragefile.h | 2 -- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 69c354e7b4..32ca481cc0 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1022,12 +1022,6 @@ virStorageFileGetMetadataInternal(virStorageSourcePt= r meta, fileTypeInfo[meta->format].getFeatures(&meta->features, meta->form= at, buf, len) < 0) return -1; - VIR_FREE(meta->externalDataStoreRaw); - if (meta->format =3D=3D VIR_STORAGE_FILE_QCOW2 && - qcow2GetExtensions(buf, len, NULL, &meta->externalDataStoreRaw) < = 0) { - return -1; - } - VIR_FREE(meta->compat); if (meta->format =3D=3D VIR_STORAGE_FILE_QCOW2 && meta->features) meta->compat =3D g_strdup("1.1"); @@ -2410,7 +2404,6 @@ virStorageSourceCopy(const virStorageSource *src, def->relPath =3D g_strdup(src->relPath); def->backingStoreRaw =3D g_strdup(src->backingStoreRaw); def->backingStoreRawFormat =3D src->backingStoreRawFormat; - def->externalDataStoreRaw =3D g_strdup(src->externalDataStoreRaw); def->snapshot =3D g_strdup(src->snapshot); def->configFile =3D g_strdup(src->configFile); def->nodeformat =3D g_strdup(src->nodeformat); @@ -2702,7 +2695,6 @@ virStorageSourceClear(virStorageSourcePtr def) virStorageSourceSeclabelsClear(def); virStoragePermsFree(def->perms); VIR_FREE(def->timestamps); - VIR_FREE(def->externalDataStoreRaw); virStorageSourceSliceFree(def->sliceStorage); @@ -5280,13 +5272,11 @@ virStorageFileGetMetadataRecurse(virStorageSourcePt= r src, return -1; /* If we probed the format we MUST ensure that nothing else than the c= urrent - * image (this includes both backing files and external data store) is - * considered for security labelling and/or recursion. */ + * image is considered for security labelling and/or recursion. */ if (orig_format =3D=3D VIR_STORAGE_FILE_AUTO) { - if (src->backingStoreRaw || src->externalDataStoreRaw) { + if (src->backingStoreRaw) { src->format =3D VIR_STORAGE_FILE_RAW; VIR_FREE(src->backingStoreRaw); - VIR_FREE(src->externalDataStoreRaw); return -2; } } diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 8fe8e7c822..d56d5c45e3 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -345,8 +345,6 @@ struct _virStorageSource { * current file. */ char *backingStoreRaw; virStorageFileFormat backingStoreRawFormat; - /* Name of the child data file recorded in metadata of the current fil= e. */ - char *externalDataStoreRaw; /* metadata that allows identifying given storage source */ char *nodeformat; /* name of the format handler object */ --=20 2.26.0