From patchwork Mon Oct 7 21:49:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 175418 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4845796ill; Mon, 7 Oct 2019 14:49:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqzjI01D9yXH06oIscI6iJJ4/uBBUxEsLkdjWnUPE/MkigjqqsYTu+fghSuYIplKpTfC2vwA X-Received: by 2002:a92:b684:: with SMTP id m4mr30925477ill.181.1570484978146; Mon, 07 Oct 2019 14:49:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570484978; cv=none; d=google.com; s=arc-20160816; b=vUl9n2f09p+RlZWiHFAjMqEc2+PuDm7alHQkBcLDMTXKpyNeeYlta2IpDoth3Dcn21 B1KUMdlj0u5uLJCuWiwveqoGw8Ug/7VcKixLRIeSe82xraRIxLMyKjKF+k/bilqmQgWS aZ/ad/en55LWxskZ0g3IYuGLSmdCXSjte4wVlG+t1HaI31ctth7WnFYiQyqyMMH/Pydr E9TBkUEOSiNZnN+JWofH1JrnvZhyYCjz41T8Y5SDWTI8NW3y1EuzxGmTrcUqPTozDeBz 09f0cynvK/WPte+Efkvn9X+xkjmzBpefOhtzGpujhbOn1H/csJM+R+rwVPQSdZGrqJe6 IDQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=7ts8cqzcvDPehDS++7zhERPB43EKIsUt7lYTiYUZ6nQ=; b=v3v2ShZvod30s41mAFTXh4abHOvbdhWynl2RVhZoApLhwKHuSEP6KZbc3aZhnUq3tn zdxeyGIvfcANGD49xLMW6JbFaAOoPDlTYXQ8ZCEVlVbbi7RgUjAoIf0VR08pWaT5JK/F mc/j+dKWiBTW4qpfzsTGZ1KoNUCLtywh+li1Z8Jj6HK/SzCR8CaiCRk1E+fDHoJs9O8J 82yehuQPjgvyzUdY5OyZJ6NFmRE2jKglCQI/3MR4rPbvV3bkaE5xeYqKQPiYTbvkqtEl Vo/VxZ9YNRX/+E5VVntiBu0YWtR+vv5BuPUo4b2Wv8BKN37pGv/frnVSk2RrVARwEjXe Zs+A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id q7si17955126ioi.39.2019.10.07.14.49.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Oct 2019 14:49:38 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EF3F02A09CD; Mon, 7 Oct 2019 21:49:36 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CC1875DA8C; Mon, 7 Oct 2019 21:49:36 +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 8B9F81803B4D; Mon, 7 Oct 2019 21:49:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x97LnMTm014511 for ; Mon, 7 Oct 2019 17:49:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2EA365C219; Mon, 7 Oct 2019 21:49:22 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-123-156.rdu2.redhat.com [10.10.123.156]) by smtp.corp.redhat.com (Postfix) with ESMTP id C68155C1D4; Mon, 7 Oct 2019 21:49:21 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 7 Oct 2019 17:49:15 -0400 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/30] storagefile: Make GetMetadataInternal static 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 07 Oct 2019 21:49:37 +0000 (UTC) It is only used in virstoragefile.c Signed-off-by: Cole Robinson --- src/libvirt_private.syms | 1 - src/util/virstoragefile.c | 2 +- src/util/virstoragefile.h | 6 ------ 3 files changed, 1 insertion(+), 8 deletions(-) -- 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Daniel Henrique Barboza diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index eeab820eca..ca9581bd94 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2988,7 +2988,6 @@ virStorageFileGetLVMKey; virStorageFileGetMetadata; virStorageFileGetMetadataFromBuf; virStorageFileGetMetadataFromFD; -virStorageFileGetMetadataInternal; virStorageFileGetNPIVKey; virStorageFileGetRelativeBackingPath; virStorageFileGetSCSIKey; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 3201f57e62..51726006e7 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -970,7 +970,7 @@ virStorageFileGetEncryptionPayloadOffset(const struct FileEncryptionInfo *info, * Note that this function may be called repeatedly on @meta, so it must * clean up any existing allocated memory which would be overwritten. */ -int +static int virStorageFileGetMetadataInternal(virStorageSourcePtr meta, char *buf, size_t len, diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 81b83a53ef..2472d89c85 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -346,12 +346,6 @@ struct _virStorageSource { int virStorageFileProbeFormat(const char *path, uid_t uid, gid_t gid); -int virStorageFileGetMetadataInternal(virStorageSourcePtr meta, - char *buf, - size_t len, - int *backingFormat) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); - virStorageSourcePtr virStorageFileGetMetadataFromFD(const char *path, int fd, int format,