From patchwork Thu Oct 13 12:36:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1689549 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=UJvPd+9u; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mp8dn1Kgwz23jn for ; Thu, 13 Oct 2022 23:55:57 +1100 (AEDT) Received: from localhost ([::1]:51554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oixkh-0000Wv-2O for incoming@patchwork.ozlabs.org; Thu, 13 Oct 2022 08:55:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oixT4-0001Zv-6p for qemu-devel@nongnu.org; Thu, 13 Oct 2022 08:37:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:23530) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oixT2-00047R-Sp for qemu-devel@nongnu.org; Thu, 13 Oct 2022 08:37:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665664660; 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=vPMZJNlEf3JbCTvB/GnlZ412UQC8xpJaTx7rZhN7KYw=; b=UJvPd+9ujbum6x8DiIzF5+SmnSas15NQckJYh9CedjWOUwtTW2mNSI0VhyNe5tliEromyw /Yz9i2Rg/6TGhXq1H7ap62Cso9pHnAbX2lLruVE721OILS2+rfw3gVzpJD88sEhq6jdQim 7gKeM9zw9pwT6gNvHYWt3j0tV7WpF+w= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-533-zKUp_-VEOjaJgZvDGftk1w-1; Thu, 13 Oct 2022 08:37:39 -0400 X-MC-Unique: zKUp_-VEOjaJgZvDGftk1w-1 Received: by mail-ej1-f72.google.com with SMTP id hp41-20020a1709073e2900b0078e07dbf280so824382ejc.7 for ; Thu, 13 Oct 2022 05:37:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vPMZJNlEf3JbCTvB/GnlZ412UQC8xpJaTx7rZhN7KYw=; b=bAIh4ewEfKJbC/bX3ClWpW+9VJdi0f8ziG7+enggRTSLCVQTJJhqgi56bWVlhCH7E9 uXym3gFvs9lFQUnjKwo2MrKNFvyGTHUHcUjGvyIS5KnlCSWjB+SZpxU7NuMJPQagQ/IC gZwHPweEVidPhKWaADE5J8BPA78PkcsIFYtlQQQMG6oNt5y1XxcK2ORbKdxB8g4/wc3s Xn78tU9vduoKtaMvzkHpwh54AVNlvY8DvactBfqWx8MMrXn6HNQ+UkLNanjDaj+nXgXl PQMMoiViAZFB6LwK7QJ1irKbFI1RHGdX1fuIlLytsXKkjzBwzeRrOdXEFY+Pf1PL1L6M LNcQ== X-Gm-Message-State: ACrzQf2v967yn2XaoP1VQzb1GL8Q15TGCKTZ8YVsIrn9t2LtLLGWxrLG jc2rOGm8x897YJ73xLhLgFzdXK0A/B7DvL9PmwgcSUmrcNfgb9B6/XzRE8RorVaBXBgSr4eqSiw 50dBkrUtAPt3sVBegaHapamKOIbLYBKK1Y25WdpI43k5Duh+fkP6N2Dts1OTy/8pIZfE= X-Received: by 2002:a05:6402:496:b0:443:a5f5:d3b with SMTP id k22-20020a056402049600b00443a5f50d3bmr32788056edv.331.1665664657596; Thu, 13 Oct 2022 05:37:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4PiIw+Li4443xUXUZjv5vbstT1IAuSydqemu/0ksaB8FPW+TJP1Qn98Z+ZPVLPbxSAPmNmHA== X-Received: by 2002:a05:6402:496:b0:443:a5f5:d3b with SMTP id k22-20020a056402049600b00443a5f50d3bmr32788039edv.331.1665664657316; Thu, 13 Oct 2022 05:37:37 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id lb5-20020a170907784500b0078c468bd604sm2981324ejc.57.2022.10.13.05.37.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 05:37:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, afaria@redhat.com Subject: [PATCH 08/24] block: add missing coroutine_fn annotation to BlockDriverState callbacks Date: Thu, 13 Oct 2022 14:36:55 +0200 Message-Id: <20221013123711.620631-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221013123711.620631-1-pbonzini@redhat.com> References: <20221013123711.620631-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Alberto Faria Signed-off-by: Alberto Faria Signed-off-by: Paolo Bonzini --- block/qcow2.h | 14 +++++++------- include/block/block_int-common.h | 12 +++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/block/qcow2.h b/block/qcow2.h index 3e7c5e80b6..ad6e7f65bd 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -991,13 +991,13 @@ int qcow2_truncate_bitmaps_check(BlockDriverState *bs, Error **errp); bool qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, bool release_stored, Error **errp); int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp); -bool qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs, - const char *name, - uint32_t granularity, - Error **errp); -int qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs, - const char *name, - Error **errp); +bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs, + const char *name, + uint32_t granularity, + Error **errp); +int coroutine_fn qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs, + const char *name, + Error **errp); bool qcow2_supports_persistent_dirty_bitmap(BlockDriverState *bs); uint64_t qcow2_get_persistent_dirty_bitmap_size(BlockDriverState *bs, uint32_t cluster_size); diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h index 8947abab76..16c45d1262 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -731,13 +731,11 @@ struct BlockDriver { void coroutine_fn (*bdrv_co_drain_end)(BlockDriverState *bs); bool (*bdrv_supports_persistent_dirty_bitmap)(BlockDriverState *bs); - bool (*bdrv_co_can_store_new_dirty_bitmap)(BlockDriverState *bs, - const char *name, - uint32_t granularity, - Error **errp); - int (*bdrv_co_remove_persistent_dirty_bitmap)(BlockDriverState *bs, - const char *name, - Error **errp); + bool coroutine_fn (*bdrv_co_can_store_new_dirty_bitmap)( + BlockDriverState *bs, const char *name, uint32_t granularity, + Error **errp); + int coroutine_fn (*bdrv_co_remove_persistent_dirty_bitmap)( + BlockDriverState *bs, const char *name, Error **errp); }; static inline bool block_driver_can_compress(BlockDriver *drv)