From nobody Sun Feb 8 15:08:35 2026 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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=1611257705; cv=none; d=zohomail.com; s=zohoarc; b=QlKq4PD5I/V9fexHn54ymM7ZGZiY6jWJTofc0L1eCHyDHH049DWr+0GlxivvM77D6fh46JHMmqhCMNdo0LnrUxWO4BIrHTQe2ybkX8jIj8MQejEnS5uNsPBier9wK4lZ+fDPHPGuGj0Lv2YcMlYh51xfuQwOJZrO87rkzt8k5X4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611257705; 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=0CIEmZzkbu2+CIl65DvpElj9Z7eb9GWtPdgd//ybFvE=; b=dK1hnFO7+hVUp4U50MOSCshlFxU5r39OcfAyWS8TfYU6227O9vPLpCYLn9HPf+wSTs9n197YOrdgQ/AasHL9tYCzIqWlHHbN2/h7hnMQuT/bd4y/iEkPAGERwyZH9du7o478+xx/DDQGLX3WDB++W0h3yQGPgTkqcnKLeYAq3xM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1611257705864998.9642784605117; Thu, 21 Jan 2021 11:35:05 -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-142-wKHbNY06P_uHh_8WFVoaJA-1; Thu, 21 Jan 2021 14:35:01 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7771B8030AA; Thu, 21 Jan 2021 19:34:52 +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 5572260C6B; Thu, 21 Jan 2021 19:34:52 +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 1E2D450034; Thu, 21 Jan 2021 19:34:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10LJYjbh023230 for ; Thu, 21 Jan 2021 14:34:45 -0500 Received: by smtp.corp.redhat.com (Postfix) id 653781002382; Thu, 21 Jan 2021 19:34:45 +0000 (UTC) Received: from antique-laptop.redhat.com (unknown [10.40.208.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63635100AE37 for ; Thu, 21 Jan 2021 19:34:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611257704; 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=0CIEmZzkbu2+CIl65DvpElj9Z7eb9GWtPdgd//ybFvE=; b=RTozUpdhUGpcT8pICkRMuNF6k3OYZ+YzA4lmBAZHEKvxABaLMoPgWZejL7cASZk2hKoAxk 6L+Y9viVmNzatooSMNPR+PgmgpvNeDwmBZFd7i49lIgjiNIDH862RLmV41J1fkyMrihc8c psmJ86cCmSE085yvZ8MccFrvh/nd2o0= X-MC-Unique: wKHbNY06P_uHh_8WFVoaJA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v2 09/13] util: move virStorageFileProbe code into storage_file Date: Thu, 21 Jan 2021 20:34:23 +0100 Message-Id: <32a2d137ed58ef070a4b53afc69ad84a405812ee.1611257578.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.12 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" Same as virStorageFileBackend, it doesn't belong into util directory. Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa --- po/POTFILES.in | 2 +- src/libvirt_private.syms | 10 +++++----- src/qemu/qemu_driver.c | 2 +- src/storage/storage_backend_gluster.c | 2 +- src/storage/storage_util.c | 2 +- src/storage_file/meson.build | 1 + .../storage_file_probe.c} | 6 +++--- .../storage_file_probe.h} | 2 +- src/storage_file/storage_source.c | 2 +- src/util/meson.build | 1 - 10 files changed, 15 insertions(+), 15 deletions(-) rename src/{util/virstoragefileprobe.c =3D> storage_file/storage_file_prob= e.c} (99%) rename src/{util/virstoragefileprobe.h =3D> storage_file/storage_file_prob= e.h} (95%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 4da22ede8f..eeff3f9f2f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -226,6 +226,7 @@ @SRCDIR@src/storage_file/storage_file_backend.c @SRCDIR@src/storage_file/storage_file_fs.c @SRCDIR@src/storage_file/storage_file_gluster.c +@SRCDIR@src/storage_file/storage_file_probe.c @SRCDIR@src/storage_file/storage_source.c @SRCDIR@src/test/test_driver.c @SRCDIR@src/util/iohelper.c @@ -307,7 +308,6 @@ @SRCDIR@src/util/virsocketaddr.c @SRCDIR@src/util/virstorageencryption.c @SRCDIR@src/util/virstoragefile.c -@SRCDIR@src/util/virstoragefileprobe.c @SRCDIR@src/util/virstring.c @SRCDIR@src/util/virsysinfo.c @SRCDIR@src/util/virsystemd.c diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e7af8f0599..b49eee3750 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1622,6 +1622,11 @@ virSecurityXATTRNamespaceDefined; virStorageFileBackendRegister; =20 =20 +# storage_file/storage_file_probe.h +virStorageFileProbeFormat; +virStorageFileProbeGetMetadata; + + # storage_file/storage_source.h virStorageFileAccess; virStorageFileChainLookup; @@ -3214,11 +3219,6 @@ virStorageTypeFromString; virStorageTypeToString; =20 =20 -# util/virstoragefileprobe.h -virStorageFileProbeFormat; -virStorageFileProbeGetMetadata; - - # util/virstring.h virSkipSpaces; virSkipSpacesAndBackslash; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a5c2488f2c..5363af3f56 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -83,7 +83,7 @@ #include "domain_nwfilter.h" #include "virhook.h" #include "virstoragefile.h" -#include "virstoragefileprobe.h" +#include "storage_file_probe.h" #include "storage_source.h" #include "virfile.h" #include "virfdstream.h" diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_ba= ckend_gluster.c index 782f8eb611..554c76ddb4 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -28,9 +28,9 @@ #include "viralloc.h" #include "virerror.h" #include "virlog.h" -#include "virstoragefileprobe.h" #include "virstring.h" #include "viruri.h" +#include "storage_file_probe.h" #include "storage_util.h" #include "storage_source.h" =20 diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index d51fa2b4c0..04f9a442f2 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -62,7 +62,7 @@ #include "vircrypto.h" #include "viruuid.h" #include "virstoragefile.h" -#include "virstoragefileprobe.h" +#include "storage_file_probe.h" #include "storage_util.h" #include "storage_source.h" #include "virlog.h" diff --git a/src/storage_file/meson.build b/src/storage_file/meson.build index bcd6f01906..eb9453e7b0 100644 --- a/src/storage_file/meson.build +++ b/src/storage_file/meson.build @@ -1,6 +1,7 @@ storage_file_sources =3D [ 'storage_source.c', 'storage_file_backend.c', + 'storage_file_probe.c', ] =20 stoarge_file_fs_sources =3D [ diff --git a/src/util/virstoragefileprobe.c b/src/storage_file/storage_file= _probe.c similarity index 99% rename from src/util/virstoragefileprobe.c rename to src/storage_file/storage_file_probe.c index bca098cd35..e5e1b272ac 100644 --- a/src/util/virstoragefileprobe.c +++ b/src/storage_file/storage_file_probe.c @@ -1,5 +1,5 @@ /* - * virstoragefileprobe.c: file utility functions for FS storage backend + * storage_file_probe.c: file utility functions for FS storage backend * * Copyright (C) 2007-2017 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange @@ -26,17 +26,17 @@ #include =20 #include "internal.h" +#include "storage_file_probe.h" #include "viralloc.h" #include "virbitmap.h" #include "virendian.h" #include "virfile.h" #include "virlog.h" #include "virstoragefile.h" -#include "virstoragefileprobe.h" =20 #define VIR_FROM_THIS VIR_FROM_STORAGE =20 -VIR_LOG_INIT("util.storagefileprobe"); +VIR_LOG_INIT("storage_file.storagefileprobe"); =20 enum lv_endian { LV_LITTLE_ENDIAN =3D 1, /* 1234 */ diff --git a/src/util/virstoragefileprobe.h b/src/storage_file/storage_file= _probe.h similarity index 95% rename from src/util/virstoragefileprobe.h rename to src/storage_file/storage_file_probe.h index 2b94a4ae51..c443c11606 100644 --- a/src/util/virstoragefileprobe.h +++ b/src/storage_file/storage_file_probe.h @@ -1,5 +1,5 @@ /* - * virstoragefileprobe.h: file utility functions for FS storage backend + * storage_file_probe.h: file utility functions for FS storage backend * * Copyright (C) 2007-2009, 2012-2016 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange diff --git a/src/storage_file/storage_source.c b/src/storage_file/storage_s= ource.c index 744d3e94fd..d1e0aeb2c1 100644 --- a/src/storage_file/storage_source.c +++ b/src/storage_file/storage_source.c @@ -26,6 +26,7 @@ =20 #include "internal.h" #include "storage_file_backend.h" +#include "storage_file_probe.h" #include "storage_source.h" #include "viralloc.h" #include "virerror.h" @@ -35,7 +36,6 @@ #include "virlog.h" #include "virobject.h" #include "virstoragefile.h" -#include "virstoragefileprobe.h" #include "virstring.h" #include "viruri.h" #include "virutil.h" diff --git a/src/util/meson.build b/src/util/meson.build index 64c0f9df6d..b510f0ebe9 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -90,7 +90,6 @@ util_sources =3D [ 'virsocketaddr.c', 'virstorageencryption.c', 'virstoragefile.c', - 'virstoragefileprobe.c', 'virstring.c', 'virsysinfo.c', 'virsystemd.c', --=20 2.29.2