From nobody Tue Feb 10 05:50:28 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1674755276; cv=none; d=zohomail.com; s=zohoarc; b=L9lXV+aFGWrP6Tx8V0xAi0AXhckTbC94oBX/IrQVaTThcSeP7ePg97qZhWTEhtIpoxC5y2NeeEXetlKk4EJgbUbYJXhoPQhJg8lTknQ9P585isPXy0GZTWTnzFIcB0Cv0/9YJypzyDFTulK/2drSnkTYIDVl93HfpbfWfI+0TsA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1674755276; h=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=a1BDqv1R23MIjrTbhID7QmN61W7wB8wuMHTM5FPawH0=; b=a2jLLi5whHKU1kfckWQyV48OJP4+lTdx5FNCZcfXmJmc4X6IwfYlyhKjtkRNEyxCn+QSzsbueVWQG9Sisx/lfmAlPi01QsJOrmPSANJxaMPwvEOq+dKI0lhwbxfjFAGVyZ9ygnx5Mqwr/Igc1lrariSHWu8MMO1RffTPktHRdHE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1674755276157677.555276289601; Thu, 26 Jan 2023 09:47:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pL5zt-0005ko-LM; Thu, 26 Jan 2023 12:25:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pL5zp-0005i3-7Z for qemu-devel@nongnu.org; Thu, 26 Jan 2023 12:25:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pL5zk-0006KR-Vw for qemu-devel@nongnu.org; Thu, 26 Jan 2023 12:25:07 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-455-lrxjTivJMZuBsy3sc4tM-A-1; Thu, 26 Jan 2023 12:25:01 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A3A7780B3DD; Thu, 26 Jan 2023 17:25:00 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.193.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79FE8492C14; Thu, 26 Jan 2023 17:24:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674753904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a1BDqv1R23MIjrTbhID7QmN61W7wB8wuMHTM5FPawH0=; b=Ykd6C/Ubue+cfrPQEszSsynpzCJ0EyPEUES9pqFn1sTp5Sygpx1ujXfPYy2RUpaY0ViEKK 5i7sSdlhitK2vtA8Szkt8RfTfgcekxRv9Drx7Rs2sc8SWnDRcEt2N00uGUd53Zpq8vZWyq ji36xJzCqCIMhEwptfDyAeW2A19ESBo= X-MC-Unique: lrxjTivJMZuBsy3sc4tM-A-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, eesposit@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 10/13] vmdk: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper Date: Thu, 26 Jan 2023 18:24:29 +0100 Message-Id: <20230126172432.436111-11-kwolf@redhat.com> In-Reply-To: <20230126172432.436111-1-kwolf@redhat.com> References: <20230126172432.436111-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=170.10.129.124; envelope-from=kwolf@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, RCVD_IN_MSPIKE_H2=-0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1674755277332100001 Content-Type: text/plain; charset="utf-8" .bdrv_co_create implementations run in a coroutine. Therefore they are not allowed to open images directly. Fix the calls to use the corresponding no_co_wrappers instead. Signed-off-by: Kevin Wolf --- block/vmdk.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 5b0eae877e..171c9272ca 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -2299,9 +2299,9 @@ static int coroutine_fn vmdk_create_extent(const char= *filename, goto exit; } =20 - blk =3D blk_new_open(filename, NULL, NULL, - BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL, - errp); + blk =3D blk_co_new_open(filename, NULL, NULL, + BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL, + errp); if (blk =3D=3D NULL) { ret =3D -EIO; goto exit; @@ -2518,8 +2518,8 @@ static int coroutine_fn vmdk_co_do_create(int64_t siz= e, } assert(full_backing); =20 - backing =3D blk_new_open(full_backing, NULL, NULL, - BDRV_O_NO_BACKING, errp); + backing =3D blk_co_new_open(full_backing, NULL, NULL, + BDRV_O_NO_BACKING, errp); g_free(full_backing); if (backing =3D=3D NULL) { ret =3D -EIO; @@ -2781,7 +2781,7 @@ static BlockBackend * coroutine_fn vmdk_co_create_cb(= int64_t size, int idx, BlockdevCreateOptionsVmdk *opts =3D opaque; =20 if (idx =3D=3D 0) { - bs =3D bdrv_open_blockdev_ref(opts->file, errp); + bs =3D bdrv_co_open_blockdev_ref(opts->file, errp); } else { int i; BlockdevRefList *list =3D opts->extents; @@ -2796,14 +2796,16 @@ static BlockBackend * coroutine_fn vmdk_co_create_c= b(int64_t size, int idx, error_setg(errp, "Extent [%d] not specified", idx - 1); return NULL; } - bs =3D bdrv_open_blockdev_ref(list->value, errp); + bs =3D bdrv_co_open_blockdev_ref(list->value, errp); } if (!bs) { return NULL; } - blk =3D blk_new_with_bs(bs, - BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE | BLK_= PERM_RESIZE, - BLK_PERM_ALL, errp); + blk =3D blk_co_new_with_bs(bs, + BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE | + BLK_PERM_RESIZE, + BLK_PERM_ALL, + errp); if (!blk) { return NULL; } --=20 2.38.1