{"id":816240,"url":"http://patchwork.ozlabs.org/api/patches/816240/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170920102311.25736-3-el13635@mail.ntua.gr/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170920102311.25736-3-el13635@mail.ntua.gr>","list_archive_url":null,"date":"2017-09-20T10:23:10","name":"[2/3] block: rename bdrv_co_drain to bdrv_co_drain_begin","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"bb5cf13e976d498d2172e1b4e3611fa9dd181614","submitter":{"id":71571,"url":"http://patchwork.ozlabs.org/api/people/71571/?format=json","name":"Manos Pitsidianakis","email":"el13635@mail.ntua.gr"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170920102311.25736-3-el13635@mail.ntua.gr/mbox/","series":[{"id":4124,"url":"http://patchwork.ozlabs.org/api/series/4124/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=4124","date":"2017-09-20T10:23:09","name":"add bdrv_co_drain_begin/end BlockDriver callbacks","version":1,"mbox":"http://patchwork.ozlabs.org/series/4124/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816240/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816240/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xy1kH2slWz9s82\n\tfor ;\n\tThu, 21 Sep 2017 00:06:15 +1000 (AEST)","from localhost ([::1]:48301 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dufdl-0003BJ-AG\n\tfor incoming@patchwork.ozlabs.org; Wed, 20 Sep 2017 10:06:13 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41820)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dufAZ-00028V-U1\n\tfor qemu-devel@nongnu.org; Wed, 20 Sep 2017 09:36:04 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dufAY-00015I-Vw\n\tfor qemu-devel@nongnu.org; Wed, 20 Sep 2017 09:36:03 -0400","from smtp1.ntua.gr ([2001:648:2000:de::183]:20570)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from )\n\tid 1dufAO-0000sM-Qy; Wed, 20 Sep 2017 09:35:53 -0400","from mail.ntua.gr (carp0.noc.ntua.gr [147.102.222.60])\n\t(authenticated bits=0)\n\tby smtp1.ntua.gr (8.15.2/8.15.2) with ESMTPSA id v8KANOBQ022776\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=NOT); Wed, 20 Sep 2017 13:23:24 +0300 (EEST)\n\t(envelope-from el13635@mail.ntua.gr)"],"X-Authentication-Warning":"smtp1.ntua.gr: Host carp0.noc.ntua.gr\n\t[147.102.222.60] claimed to be mail.ntua.gr","From":"Manos Pitsidianakis ","To":"qemu-devel ","Date":"Wed, 20 Sep 2017 13:23:10 +0300","Message-Id":"<20170920102311.25736-3-el13635@mail.ntua.gr>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170920102311.25736-1-el13635@mail.ntua.gr>","References":"<20170920102311.25736-1-el13635@mail.ntua.gr>","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2001:648:2000:de::183","Subject":"[Qemu-devel] [PATCH 2/3] block: rename bdrv_co_drain to\n\tbdrv_co_drain_begin","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Kevin Wolf , Fam Zheng ,\n\tStefan Hajnoczi ,\n\tqemu-block , Max Reitz ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Manos Pitsidianakis \n---\n include/block/block_int.h | 2 +-\n block/io.c | 4 ++--\n block/qed.c | 6 +++---\n 3 files changed, 6 insertions(+), 6 deletions(-)","diff":"diff --git a/include/block/block_int.h b/include/block/block_int.h\nindex ea1326e3c7..fd10f53b43 100644\n--- a/include/block/block_int.h\n+++ b/include/block/block_int.h\n@@ -357,7 +357,7 @@ struct BlockDriver {\n * Drain and stop any internal sources of requests in the driver, and\n * remain so until next I/O callback (e.g. bdrv_co_writev) is called.\n */\n- void coroutine_fn (*bdrv_co_drain)(BlockDriverState *bs);\n+ void coroutine_fn (*bdrv_co_drain_begin)(BlockDriverState *bs);\n \n void coroutine_fn (*bdrv_co_drain_end)(BlockDriverState *bs);\n \ndiff --git a/block/io.c b/block/io.c\nindex 465345289d..6b4b13b777 100644\n--- a/block/io.c\n+++ b/block/io.c\n@@ -162,7 +162,7 @@ static void coroutine_fn bdrv_drain_invoke_entry(void *opaque)\n BlockDriverState *bs = data->bs;\n \n if (data->begin) {\n- bs->drv->bdrv_co_drain(bs);\n+ bs->drv->bdrv_co_drain_begin(bs);\n } else {\n bs->drv->bdrv_co_drain_end(bs);\n }\n@@ -176,7 +176,7 @@ static void bdrv_drain_invoke(BlockDriverState *bs, bool begin)\n {\n BdrvCoDrainData data = { .bs = bs, .done = false, .begin = begin};\n \n- if (!bs->drv || (begin && !bs->drv->bdrv_co_drain) ||\n+ if (!bs->drv || (begin && !bs->drv->bdrv_co_drain_begin) ||\n (!begin && !bs->drv->bdrv_co_drain_end)) {\n return;\n }\ndiff --git a/block/qed.c b/block/qed.c\nindex 28e2ec89e8..821dcaa055 100644\n--- a/block/qed.c\n+++ b/block/qed.c\n@@ -265,7 +265,7 @@ static bool qed_plug_allocating_write_reqs(BDRVQEDState *s)\n assert(!s->allocating_write_reqs_plugged);\n if (s->allocating_acb != NULL) {\n /* Another allocating write came concurrently. This cannot happen\n- * from bdrv_qed_co_drain, but it can happen when the timer runs.\n+ * from bdrv_qed_co_drain_begin, but it can happen when the timer runs.\n */\n qemu_co_mutex_unlock(&s->table_lock);\n return false;\n@@ -358,7 +358,7 @@ static void bdrv_qed_attach_aio_context(BlockDriverState *bs,\n }\n }\n \n-static void coroutine_fn bdrv_qed_co_drain(BlockDriverState *bs)\n+static void coroutine_fn bdrv_qed_co_drain_begin(BlockDriverState *bs)\n {\n BDRVQEDState *s = bs->opaque;\n \n@@ -1608,7 +1608,7 @@ static BlockDriver bdrv_qed = {\n .bdrv_check = bdrv_qed_check,\n .bdrv_detach_aio_context = bdrv_qed_detach_aio_context,\n .bdrv_attach_aio_context = bdrv_qed_attach_aio_context,\n- .bdrv_co_drain = bdrv_qed_co_drain,\n+ .bdrv_co_drain_begin = bdrv_qed_co_drain_begin,\n };\n \n static void bdrv_qed_init(void)\n","prefixes":["2/3"]}