All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, crosa@redhat.com, ehabkost@redhat.com,
	hreitz@redhat.com, kwolf@redhat.com, eblake@redhat.com,
	vsementsov@virtuozzo.com, stefanha@redhat.com
Subject: [PATCH 06/12] block-coroutine-wrapper.py: support BlockBackend first argument
Date: Wed,  6 Oct 2021 15:17:12 +0200	[thread overview]
Message-ID: <20211006131718.214235-7-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20211006131718.214235-1-vsementsov@virtuozzo.com>

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 block/coroutines.h                 |  3 +++
 scripts/block-coroutine-wrapper.py | 12 ++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/block/coroutines.h b/block/coroutines.h
index 514d169d23..35a6c49857 100644
--- a/block/coroutines.h
+++ b/block/coroutines.h
@@ -27,6 +27,9 @@
 
 #include "block/block_int.h"
 
+/* For blk_bs() in generated block/block-gen.c */
+#include "sysemu/block-backend.h"
+
 int coroutine_fn bdrv_co_check(BlockDriverState *bs,
                                BdrvCheckResult *res, BdrvCheckMode fix);
 int coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs, Error **errp);
diff --git a/scripts/block-coroutine-wrapper.py b/scripts/block-coroutine-wrapper.py
index 85dbeb9ecf..08be813407 100644
--- a/scripts/block-coroutine-wrapper.py
+++ b/scripts/block-coroutine-wrapper.py
@@ -100,12 +100,20 @@ def snake_to_camel(func_name: str) -> str:
 def gen_wrapper(func: FuncDecl) -> str:
     assert not '_co_' in func.name
     assert func.return_type == 'int'
-    assert func.args[0].type in ['BlockDriverState *', 'BdrvChild *']
+    assert func.args[0].type in ['BlockDriverState *', 'BdrvChild *',
+                                 'BlockBackend *']
 
     subsystem, subname = func.name.split('_', 1)
 
     name = f'{subsystem}_co_{subname}'
-    bs = 'bs' if func.args[0].type == 'BlockDriverState *' else 'child->bs'
+
+    t = func.args[0].type
+    if t == 'BlockDriverState *':
+        bs = 'bs'
+    elif t == 'BdrvChild *':
+        bs = 'child->bs'
+    else:
+        bs = 'blk_bs(blk)'
     struct_name = snake_to_camel(name)
 
     return f"""\
-- 
2.31.1



  parent reply	other threads:[~2021-10-06 13:25 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-06 13:17 [PATCH 00/12] block: 64bit blk io Vladimir Sementsov-Ogievskiy
2021-10-06 13:17 ` [PATCH 01/12] block-backend: blk_check_byte_request(): int64_t bytes Vladimir Sementsov-Ogievskiy
2021-10-06 15:09   ` Eric Blake
2021-10-06 13:17 ` [PATCH 02/12] block-backend: make blk_co_preadv() 64bit Vladimir Sementsov-Ogievskiy
2021-10-06 15:17   ` Eric Blake
2021-10-06 13:17 ` [PATCH 03/12] block-backend: convert blk_co_pwritev_part to int64_t bytes Vladimir Sementsov-Ogievskiy
2021-10-06 15:25   ` Eric Blake
2021-10-06 13:17 ` [PATCH 04/12] block-backend: convert blk_co_pdiscard " Vladimir Sementsov-Ogievskiy
2021-10-06 15:59   ` Eric Blake
2021-10-06 13:17 ` [PATCH 05/12] block-backend: rename _do_ helper functions to _co_do_ Vladimir Sementsov-Ogievskiy
2021-10-06 16:06   ` Eric Blake
2021-10-06 13:17 ` Vladimir Sementsov-Ogievskiy [this message]
2021-10-06 16:17   ` [PATCH 06/12] block-coroutine-wrapper.py: support BlockBackend first argument Eric Blake
2021-10-06 13:17 ` [PATCH 07/12] block-backend: drop blk_prw, use block-coroutine-wrapper Vladimir Sementsov-Ogievskiy
2021-10-06 16:22   ` Eric Blake
2021-10-06 13:17 ` [PATCH 08/12] block-backend: convert blk_foo wrappers to use int64_t bytes parameter Vladimir Sementsov-Ogievskiy
2021-10-06 16:29   ` Eric Blake
2021-10-06 13:17 ` [PATCH 09/12] block-backend: convert blk_co_copy_range to int64_t bytes Vladimir Sementsov-Ogievskiy
2021-10-06 20:04   ` Eric Blake
2021-10-06 13:17 ` [PATCH 10/12] block-backend: convert blk_aio_ functions to int64_t bytes paramter Vladimir Sementsov-Ogievskiy
2021-10-06 20:29   ` Eric Blake
2021-10-12 16:13     ` Vladimir Sementsov-Ogievskiy
2021-10-12 21:37       ` Eric Blake
2021-10-12 21:46         ` Vladimir Sementsov-Ogievskiy
2021-10-06 13:17 ` [PATCH 11/12] block-backend: blk_pread, blk_pwrite: rename count parameter to bytes Vladimir Sementsov-Ogievskiy
2021-10-06 20:33   ` Eric Blake
2021-10-06 13:17 ` [PATCH 12/12] block-backend: drop INT_MAX restriction from blk_check_byte_request() Vladimir Sementsov-Ogievskiy
2021-10-06 20:37   ` Eric Blake
2021-10-07 17:52 ` [PATCH 13/12] block-backend: fix blk_co_flush prototype to mention coroutine_fn Vladimir Sementsov-Ogievskiy
2021-10-07 20:36   ` Eric Blake
2021-10-07 17:52 ` [PATCH 14/12] block-backend: update blk_co_pwrite() and blk_co_pread() wrappers Vladimir Sementsov-Ogievskiy
2021-10-07 20:38   ` Eric Blake

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=20211006131718.214235-7-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=crosa@redhat.com \
    --cc=eblake@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=hreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /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.