{"id":813561,"url":"http://patchwork.ozlabs.org/api/patches/813561/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913181910.29688-9-mreitz@redhat.com/","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":"<20170913181910.29688-9-mreitz@redhat.com>","list_archive_url":null,"date":"2017-09-13T18:19:00","name":"[08/18] block/mirror: Use source as a BdrvChild","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b43d69ca5994d974a242c940ea3a20eb93e234e4","submitter":{"id":36836,"url":"http://patchwork.ozlabs.org/api/people/36836/?format=json","name":"Max Reitz","email":"mreitz@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913181910.29688-9-mreitz@redhat.com/mbox/","series":[{"id":2960,"url":"http://patchwork.ozlabs.org/api/series/2960/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2960","date":"2017-09-13T18:18:52","name":"block/mirror: Add active-sync mirroring","version":1,"mbox":"http://patchwork.ozlabs.org/series/2960/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813561/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813561/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=)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=mreitz@redhat.com"],"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 3xsqnN6k3dz9s9Y\n\tfor ;\n\tThu, 14 Sep 2017 04:24:24 +1000 (AEST)","from localhost ([::1]:44013 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsCKk-0002To-W1\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 14:24:23 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:36905)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsCH8-0008W0-1T\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 14:20:39 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsCH6-0005Nj-Jw\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 14:20:37 -0400","from mx1.redhat.com ([209.132.183.28]:52700)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dsCH0-0005IO-Uz; Wed, 13 Sep 2017 14:20:31 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 1312781DE6;\n\tWed, 13 Sep 2017 18:20:30 +0000 (UTC)","from localhost (ovpn-204-23.brq.redhat.com [10.40.204.23])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 9759C61787;\n\tWed, 13 Sep 2017 18:20:29 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 1312781DE6","From":"Max Reitz ","To":"qemu-block@nongnu.org","Date":"Wed, 13 Sep 2017 20:19:00 +0200","Message-Id":"<20170913181910.29688-9-mreitz@redhat.com>","In-Reply-To":"<20170913181910.29688-1-mreitz@redhat.com>","References":"<20170913181910.29688-1-mreitz@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tWed, 13 Sep 2017 18:20:30 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH 08/18] block/mirror: Use source as a BdrvChild","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\tqemu-devel@nongnu.org, Max Reitz ,\n\tStefan Hajnoczi , John Snow ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"With this, the mirror_top_bs is no longer just a technically required\nnode in the BDS graph but actually represents the block job operation.\n\nSigned-off-by: Max Reitz \n---\n block/mirror.c | 18 ++++++++++--------\n 1 file changed, 10 insertions(+), 8 deletions(-)","diff":"diff --git a/block/mirror.c b/block/mirror.c\nindex 2ece38094d..9df4157511 100644\n--- a/block/mirror.c\n+++ b/block/mirror.c\n@@ -43,8 +43,8 @@ typedef struct MirrorBlockJob {\n RateLimit limit;\n BlockBackend *target;\n BlockDriverState *mirror_top_bs;\n- BlockDriverState *source;\n BlockDriverState *base;\n+ BdrvChild *source;\n \n /* The name of the graph node to replace */\n char *replaces;\n@@ -294,7 +294,6 @@ static void coroutine_fn mirror_co_read(void *opaque)\n {\n MirrorOp *op = opaque;\n MirrorBlockJob *s = op->s;\n- BlockBackend *source = s->common.blk;\n int nb_chunks;\n uint64_t ret;\n uint64_t max_bytes;\n@@ -344,7 +343,7 @@ static void coroutine_fn mirror_co_read(void *opaque)\n s->bytes_in_flight += op->bytes;\n trace_mirror_one_iteration(s, op->offset, op->bytes);\n \n- ret = blk_co_preadv(source, op->offset, op->bytes, &op->qiov, 0);\n+ ret = bdrv_co_preadv(s->source, op->offset, op->bytes, &op->qiov, 0);\n mirror_read_complete(op, ret);\n }\n \n@@ -416,7 +415,7 @@ static unsigned mirror_perform(MirrorBlockJob *s, int64_t offset,\n \n static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)\n {\n- BlockDriverState *source = s->source;\n+ BlockDriverState *source = s->source->bs;\n MirrorOp *pseudo_op;\n int64_t offset;\n uint64_t delay_ns = 0, ret = 0;\n@@ -597,7 +596,7 @@ static void mirror_exit(BlockJob *job, void *opaque)\n MirrorBlockJob *s = container_of(job, MirrorBlockJob, common);\n MirrorExitData *data = opaque;\n AioContext *replace_aio_context = NULL;\n- BlockDriverState *src = s->source;\n+ BlockDriverState *src = s->source->bs;\n BlockDriverState *target_bs = blk_bs(s->target);\n BlockDriverState *mirror_top_bs = s->mirror_top_bs;\n Error *local_err = NULL;\n@@ -712,7 +711,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)\n {\n int64_t sector_num, end;\n BlockDriverState *base = s->base;\n- BlockDriverState *bs = s->source;\n+ BlockDriverState *bs = s->source->bs;\n BlockDriverState *target_bs = blk_bs(s->target);\n int ret, n;\n int64_t count;\n@@ -802,7 +801,7 @@ static void coroutine_fn mirror_run(void *opaque)\n {\n MirrorBlockJob *s = opaque;\n MirrorExitData *data;\n- BlockDriverState *bs = s->source;\n+ BlockDriverState *bs = s->source->bs;\n BlockDriverState *target_bs = blk_bs(s->target);\n bool need_drain = true;\n int64_t length;\n@@ -1284,7 +1283,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,\n /* The block job now has a reference to this node */\n bdrv_unref(mirror_top_bs);\n \n- s->source = bs;\n+ s->source = mirror_top_bs->backing;\n s->mirror_top_bs = mirror_top_bs;\n \n /* No resize for the target either; while the mirror is still running, a\n@@ -1330,6 +1329,9 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,\n s->should_complete = true;\n }\n \n+ s->source = mirror_top_bs->backing;\n+ s->mirror_top_bs = mirror_top_bs;\n+\n s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);\n if (!s->dirty_bitmap) {\n goto fail;\n","prefixes":["08/18"]}