qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 08/23] raw: Implement .bdrv_co_ioctl instead of .bdrv_aio_ioctl
Date: Thu, 27 Oct 2016 20:08:52 +0200	[thread overview]
Message-ID: <1477591747-21962-9-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1477591747-21962-1-git-send-email-kwolf@redhat.com>

It's the simpler interface to use for the raw format driver.

Apart from that, this removes the last user of the AIO emulation
implemented by bdrv_aio_ioctl().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 block/raw_bsd.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/block/raw_bsd.c b/block/raw_bsd.c
index 588d408..fc16ec1 100644
--- a/block/raw_bsd.c
+++ b/block/raw_bsd.c
@@ -176,12 +176,9 @@ static void raw_lock_medium(BlockDriverState *bs, bool locked)
     bdrv_lock_medium(bs->file->bs, locked);
 }
 
-static BlockAIOCB *raw_aio_ioctl(BlockDriverState *bs,
-                                 unsigned long int req, void *buf,
-                                 BlockCompletionFunc *cb,
-                                 void *opaque)
+static int raw_co_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)
 {
-    return bdrv_aio_ioctl(bs->file->bs, req, buf, cb, opaque);
+    return bdrv_co_ioctl(bs->file->bs, req, buf);
 }
 
 static int raw_has_zero_init(BlockDriverState *bs)
@@ -261,7 +258,7 @@ BlockDriver bdrv_raw = {
     .bdrv_media_changed   = &raw_media_changed,
     .bdrv_eject           = &raw_eject,
     .bdrv_lock_medium     = &raw_lock_medium,
-    .bdrv_aio_ioctl       = &raw_aio_ioctl,
+    .bdrv_co_ioctl        = &raw_co_ioctl,
     .create_opts          = &raw_create_opts,
     .bdrv_has_zero_init   = &raw_has_zero_init
 };
-- 
1.8.3.1

  parent reply	other threads:[~2016-10-27 18:09 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-27 18:08 [Qemu-devel] [PULL 00/23] Block layer patches Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 01/23] block: Use blk_co_flush() for all BB level flushes Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 02/23] block: Use blk_co_pdiscard() for all BB level discard Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 03/23] block: Remove bdrv_aio_pdiscard() Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 04/23] block: Use blk_co_ioctl() for all BB level ioctls Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 05/23] raw-posix: Don't use bdrv_ioctl() Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 06/23] block: Remove bdrv_ioctl() Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 07/23] block: Introduce .bdrv_co_ioctl() driver callback Kevin Wolf
2016-10-27 18:08 ` Kevin Wolf [this message]
2016-10-27 18:08 ` [Qemu-devel] [PULL 09/23] block: Remove bdrv_aio_ioctl() Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 10/23] qemu-iotests: Fix typo for NFS with IMGOPTSSYNTAX Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 11/23] block/nbd: Drop trailing "." in error messages Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 12/23] block/nbd: Reject port parameter without host Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 13/23] block/nbd: Default port in nbd_refresh_filename() Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 14/23] block/nbd: Use qdict_put() Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 15/23] block/nbd: Add nbd_has_filename_options_conflict() Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 16/23] block/nbd: Accept SocketAddress Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 17/23] block/nbd: Use SocketAddress options Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 18/23] qapi: Allow blockdev-add for NBD Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 19/23] iotests.py: Add qemu_nbd function Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 20/23] iotests.py: Allow concurrent qemu instances Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 21/23] socket_scm_helper: Accept fd directly Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 22/23] iotests: Add assert_json_filename_equal() method Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 23/23] iotests: Add test for NBD's blockdev-add interface Kevin Wolf
2016-10-28 13:29 ` [Qemu-devel] [PULL 00/23] Block layer patches Peter Maydell

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=1477591747-21962-9-git-send-email-kwolf@redhat.com \
    --to=kwolf@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).