From nobody Mon Feb 9 19:05:07 2026 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1588531987; cv=none; d=zohomail.com; s=zohoarc; b=CBTPvm9DibczZuluGxRN91IUMb2yvhRW+ilTGT7a6lDXWlFb0KuY+91jgnQO2syBvrXtJpuuXZJ/5oPDh9a0e8HN74CzpjBbDvPFqRwqfjOW8kpXMWRc8O3jFKpfxLIkjVZf+4LlbrgG/AyU7GyONYuXtuS3+ts7i8zyfxc3wk0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588531987; h=Content-Type:Content-Transfer-Encoding:Cc: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=j124Tl+q8lQmXNlSfb3ZcKxH4XMp9Ve/uFN0OvvrIb4=; b=D17SofhHaunlZZ5vaUJPduVURQBU66fbsXAMjyzruJM38Ra5YXEii5usw3HzkDvTJ+xRpuQN0jOgzVtnJzE7TpuAyCCNjPKa7EkFXDJV9SfaeTPMQtmaaK0c9dL88Y2Ss62lIfViMIC1D9oqQr2bAfM+p+AVhXEwwqjdsaz6YLE= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588531987894941.2574144666282; Sun, 3 May 2020 11:53:07 -0700 (PDT) Received: from localhost ([::1]:56544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVJje-0000ee-Cx for importer@patchew.org; Sun, 03 May 2020 14:53:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVJak-0003Q9-UM for qemu-devel@nongnu.org; Sun, 03 May 2020 14:43:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:44137 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jVJaf-0000Hf-Jo for qemu-devel@nongnu.org; Sun, 03 May 2020 14:43:54 -0400 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-239-7EQmdUI2NWWUpRC9SWIa9g-1; Sun, 03 May 2020 14:43:47 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1FD3D80183C; Sun, 3 May 2020 18:43:46 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1A1F5C1B2; Sun, 3 May 2020 18:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588531428; 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=j124Tl+q8lQmXNlSfb3ZcKxH4XMp9Ve/uFN0OvvrIb4=; b=W/tM6ofQ3I6SHRakoC6QLGEZRFbT7QjYYawLDz+rmbQR9katNJwks7ibuTvENbD5yEaFxy 4JI+42KqTz3L6orLv8TX8AnMPyeQXSaVzET8lO7HixU9ci/hqgSZGyNVtR0zzwdjg6DaC1 9LvJ/xgEmZ3PLsmRkC8mN++rKEsJOOI= X-MC-Unique: 7EQmdUI2NWWUpRC9SWIa9g-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v3 06/14] block/crypto: rename two functions Date: Sun, 3 May 2020 21:43:16 +0300 Message-Id: <20200503184324.12506-7-mlevitsk@redhat.com> In-Reply-To: <20200503184324.12506-1-mlevitsk@redhat.com> References: <20200503184324.12506-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=207.211.31.120; envelope-from=mlevitsk@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/03 14:43:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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, Markus Armbruster , Max Reitz , Maxim Levitsky , John Snow 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 d379e39efb..13ca1ad891 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -79,12 +79,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; @@ -97,11 +97,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 @@ -297,8 +296,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