From nobody Thu Nov 13 13:35:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580405607717451.300123099718; Thu, 30 Jan 2020 09:33:27 -0800 (PST) Received: from localhost ([::1]:36816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixDh0-0004Lc-D6 for importer@patchew.org; Thu, 30 Jan 2020 12:33:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47017) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixDdW-0007Z9-Re for qemu-devel@nongnu.org; Thu, 30 Jan 2020 12:29:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixDdV-0007zA-QS for qemu-devel@nongnu.org; Thu, 30 Jan 2020 12:29:50 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:52021 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ixDdV-0007wq-Ic for qemu-devel@nongnu.org; Thu, 30 Jan 2020 12:29:49 -0500 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-268-gcfKbGP8MO6asHYmiVLv7g-1; Thu, 30 Jan 2020 12:29:47 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id B1374100550E; Thu, 30 Jan 2020 17:29:46 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2BEAE5D9E5; Thu, 30 Jan 2020 17:29:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580405389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=21zXTpw9IH7Q2VKoQfjeXxCFhgCVnjN8u61s41vMk9s=; b=Yk6LNKaBPmo2OGzIbvZ0NYjIYN9v4enQj8yAK2AaKDMK8wVIEo9MakOPK6nZCsC4636Otz Q6iFQbkY0BYktg4QA1R3qrDIGv7O+PpKNMNlLwutgGzFW/2QIBYly2XdKmwzSQx9n3NEpl u2VnFjaNfOdvsPUPvPG68zRjlqeqOVQ= From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v2 06/14] block/crypto: rename two functions Date: Thu, 30 Jan 2020 19:29:11 +0200 Message-Id: <20200130172919.13424-7-mlevitsk@redhat.com> In-Reply-To: <20200130172919.13424-1-mlevitsk@redhat.com> References: <20200130172919.13424-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: gcfKbGP8MO6asHYmiVLv7g-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, John Snow , Markus Armbruster , Max Reitz , Maxim Levitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" rename the write_func to create_write_func, and init_func to create_init_fu= nc. This is preparation for other write_func that will be used to update the en= cryption keys. No functional changes Signed-off-by: Maxim Levitsky Reviewed-by: Daniel P. Berrang=C3=A9 --- block/crypto.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index ecf96a7a9b..0b37dae564 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -78,12 +78,12 @@ struct BlockCryptoCreateData { }; =20 =20 -static ssize_t block_crypto_write_func(QCryptoBlock *block, - size_t offset, - const uint8_t *buf, - size_t buflen, - void *opaque, - Error **errp) +static ssize_t block_crypto_create_write_func(QCryptoBlock *block, + size_t offset, + const uint8_t *buf, + size_t buflen, + void *opaque, + Error **errp) { struct BlockCryptoCreateData *data =3D opaque; ssize_t ret; @@ -96,11 +96,10 @@ static ssize_t block_crypto_write_func(QCryptoBlock *bl= ock, return ret; } =20 - -static ssize_t block_crypto_init_func(QCryptoBlock *block, - size_t headerlen, - void *opaque, - Error **errp) +static ssize_t block_crypto_create_init_func(QCryptoBlock *block, + size_t headerlen, + void *opaque, + Error **errp) { struct BlockCryptoCreateData *data =3D opaque; =20 @@ -296,8 +295,8 @@ static int block_crypto_co_create_generic(BlockDriverSt= ate *bs, }; =20 crypto =3D qcrypto_block_create(opts, NULL, - block_crypto_init_func, - block_crypto_write_func, + block_crypto_create_init_func, + block_crypto_create_write_func, &data, errp); =20 --=20 2.17.2