From: Kevin Wolf <kwolf@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, afaria@redhat.com
Subject: Re: [PATCH 23/24] vmdk: switch to *_co_* functions
Date: Thu, 27 Oct 2022 19:07:44 +0200 [thread overview]
Message-ID: <Y1q64L39YhSaVb1T@redhat.com> (raw)
In-Reply-To: <20221013123711.620631-24-pbonzini@redhat.com>
Am 13.10.2022 um 14:37 hat Paolo Bonzini geschrieben:
> From: Alberto Faria <afaria@redhat.com>
>
> Signed-off-by: Alberto Faria <afaria@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> @@ -1624,12 +1624,11 @@ static int coroutine_fn get_cluster_offset(BlockDriverState *bs,
> }
> l2_table = (char *)extent->l2_cache + (min_index * l2_size_bytes);
> BLKDBG_EVENT(extent->file, BLKDBG_L2_LOAD);
> - if (bdrv_pread(extent->file,
> + if (bdrv_co_pread(extent->file,
> (int64_t)l2_offset * 512,
> l2_size_bytes,
> - l2_table,
> - 0
> - ) < 0) {
> + l2_table, 0
> + ) != l2_size_bytes) {
Another incorrect conflict resolution, this would revert part of commit
353a5d84b25. Fixing it up as well.
Kevin
next prev parent reply other threads:[~2022-10-27 17:09 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-13 12:36 [PATCH 00/24] More coroutine_fn fixes Paolo Bonzini
2022-10-13 12:36 ` [PATCH 01/24] backup: remove incorrect coroutine_fn annotation Paolo Bonzini
2022-10-13 12:36 ` [PATCH 02/24] block: " Paolo Bonzini
2022-10-13 12:36 ` [PATCH 03/24] monitor: add missing " Paolo Bonzini
2022-10-13 12:36 ` [PATCH 04/24] ssh: " Paolo Bonzini
2022-10-13 12:36 ` [PATCH 05/24] block: add missing coroutine_fn annotation to prototypes Paolo Bonzini
2022-10-13 12:36 ` [PATCH 06/24] coroutine-lock: " Paolo Bonzini
2022-10-13 12:36 ` [PATCH 07/24] coroutine-io: " Paolo Bonzini
2022-10-13 12:36 ` [PATCH 08/24] block: add missing coroutine_fn annotation to BlockDriverState callbacks Paolo Bonzini
2022-10-13 12:36 ` [PATCH 09/24] qcow2: add coroutine_fn annotation for indirect-called functions Paolo Bonzini
2022-10-13 12:36 ` [PATCH 10/24] blkdebug: add missing " Paolo Bonzini
2022-10-13 12:36 ` [PATCH 11/24] qcow: manually add more coroutine_fn annotations Paolo Bonzini
2022-10-13 12:36 ` [PATCH 12/24] qcow2: " Paolo Bonzini
2022-10-13 12:37 ` [PATCH 13/24] vmdk: " Paolo Bonzini
2022-10-13 12:37 ` [PATCH 14/24] commit: switch to *_co_* functions Paolo Bonzini
2022-10-13 12:37 ` [PATCH 15/24] block: " Paolo Bonzini
2022-10-13 12:37 ` [PATCH 16/24] mirror: " Paolo Bonzini
2022-10-13 12:37 ` [PATCH 17/24] parallels: " Paolo Bonzini
2022-10-13 12:37 ` [PATCH 18/24] qcow: " Paolo Bonzini
2022-10-13 12:37 ` [PATCH 19/24] qcow2: " Paolo Bonzini
2022-10-27 17:05 ` Kevin Wolf
2022-10-13 12:37 ` [PATCH 20/24] qed: " Paolo Bonzini
2022-10-13 12:37 ` [PATCH 21/24] vdi: " Paolo Bonzini
2022-10-13 12:37 ` [PATCH 22/24] vhdx: " Paolo Bonzini
2022-10-13 12:37 ` [PATCH 23/24] vmdk: " Paolo Bonzini
2022-10-27 17:07 ` Kevin Wolf [this message]
2022-10-13 12:37 ` [PATCH 24/24] monitor: " Paolo Bonzini
2022-10-27 17:15 ` [PATCH 00/24] More coroutine_fn fixes Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y1q64L39YhSaVb1T@redhat.com \
--to=kwolf@redhat.com \
--cc=afaria@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.