From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ33h-0001lq-KZ for qemu-devel@nongnu.org; Tue, 30 Sep 2014 15:26:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZ33b-0000qK-Qr for qemu-devel@nongnu.org; Tue, 30 Sep 2014 15:26:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37922) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ33b-0000q2-8N for qemu-devel@nongnu.org; Tue, 30 Sep 2014 15:25:55 -0400 From: Markus Armbruster Date: Tue, 30 Sep 2014 21:25:28 +0200 Message-Id: <1412105144-532-8-git-send-email-armbru@redhat.com> In-Reply-To: <1412105144-532-1-git-send-email-armbru@redhat.com> References: <1412105144-532-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 07/23] block: Eliminate bdrv_iterate(), use bdrv_next() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, benoit.canet@nodalink.com, stefanha@redhat.com, mreitz@redhat.com Signed-off-by: Markus Armbruster Reviewed-by: Beno=C3=AEt Canet Reviewed-by: Max Reitz Reviewed-by: Kevin Wolf --- block-migration.c | 30 +++++++++++++++--------------- block.c | 9 --------- blockdev.c | 31 +++++++++++++------------------ include/block/block.h | 2 -- monitor.c | 32 +++++++++----------------------- 5 files changed, 37 insertions(+), 67 deletions(-) diff --git a/block-migration.c b/block-migration.c index 3ad31a2..cb3e16c 100644 --- a/block-migration.c +++ b/block-migration.c @@ -343,12 +343,25 @@ static void unset_dirty_tracking(void) } } =20 -static void init_blk_migration_it(void *opaque, BlockDriverState *bs) +static void init_blk_migration(QEMUFile *f) { + BlockDriverState *bs; BlkMigDevState *bmds; int64_t sectors; =20 - if (!bdrv_is_read_only(bs)) { + block_mig_state.submitted =3D 0; + block_mig_state.read_done =3D 0; + block_mig_state.transferred =3D 0; + block_mig_state.total_sector_sum =3D 0; + block_mig_state.prev_progress =3D -1; + block_mig_state.bulk_completed =3D 0; + block_mig_state.zero_blocks =3D migrate_zero_blocks(); + + for (bs =3D bdrv_next(NULL); bs; bs =3D bdrv_next(bs)) { + if (bdrv_is_read_only(bs)) { + continue; + } + sectors =3D bdrv_nb_sectors(bs); if (sectors <=3D 0) { return; @@ -378,19 +391,6 @@ static void init_blk_migration_it(void *opaque, Bloc= kDriverState *bs) } } =20 -static void init_blk_migration(QEMUFile *f) -{ - block_mig_state.submitted =3D 0; - block_mig_state.read_done =3D 0; - block_mig_state.transferred =3D 0; - block_mig_state.total_sector_sum =3D 0; - block_mig_state.prev_progress =3D -1; - block_mig_state.bulk_completed =3D 0; - block_mig_state.zero_blocks =3D migrate_zero_blocks(); - - bdrv_iterate(init_blk_migration_it, NULL); -} - /* Called with no lock taken. */ =20 static int blk_mig_save_bulked_block(QEMUFile *f) diff --git a/block.c b/block.c index d6ab0c7..5fd173a 100644 --- a/block.c +++ b/block.c @@ -3906,15 +3906,6 @@ BlockDriverState *bdrv_next(BlockDriverState *bs) return QTAILQ_NEXT(bs, device_list); } =20 -void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), void *= opaque) -{ - BlockDriverState *bs; - - QTAILQ_FOREACH(bs, &bdrv_states, device_list) { - it(opaque, bs); - } -} - const char *bdrv_get_device_name(BlockDriverState *bs) { return bs->device_name; diff --git a/blockdev.c b/blockdev.c index 07321b1..09ce9fa 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2550,26 +2550,21 @@ fail: qmp_output_visitor_cleanup(ov); } =20 -static void do_qmp_query_block_jobs_one(void *opaque, BlockDriverState *= bs) -{ - BlockJobInfoList **prev =3D opaque; - BlockJob *job =3D bs->job; - - if (job) { - BlockJobInfoList *elem =3D g_new0(BlockJobInfoList, 1); - elem->value =3D block_job_query(bs->job); - (*prev)->next =3D elem; - *prev =3D elem; - } -} - BlockJobInfoList *qmp_query_block_jobs(Error **errp) { - /* Dummy is a fake list element for holding the head pointer */ - BlockJobInfoList dummy =3D {}; - BlockJobInfoList *prev =3D &dummy; - bdrv_iterate(do_qmp_query_block_jobs_one, &prev); - return dummy.next; + BlockJobInfoList *head =3D NULL, **p_next =3D &head; + BlockDriverState *bs; + + for (bs =3D bdrv_next(NULL); bs; bs =3D bdrv_next(bs)) { + if (bs->job) { + BlockJobInfoList *elem =3D g_new0(BlockJobInfoList, 1); + elem->value =3D block_job_query(bs->job); + *p_next =3D elem; + p_next =3D &elem->next; + } + } + + return head; } =20 QemuOptsList qemu_common_drive_opts =3D { diff --git a/include/block/block.h b/include/block/block.h index a3039ce..6c97dd4 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -411,8 +411,6 @@ BlockDriverState *bdrv_lookup_bs(const char *device, Error **errp); bool bdrv_chain_contains(BlockDriverState *top, BlockDriverState *base); BlockDriverState *bdrv_next(BlockDriverState *bs); -void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), - void *opaque); int bdrv_is_encrypted(BlockDriverState *bs); int bdrv_key_required(BlockDriverState *bs); int bdrv_set_key(BlockDriverState *bs, const char *key); diff --git a/monitor.c b/monitor.c index 2d14f39..412e63f 100644 --- a/monitor.c +++ b/monitor.c @@ -4216,24 +4216,6 @@ static void file_completion(Monitor *mon, const ch= ar *input) closedir(ffs); } =20 -typedef struct MonitorBlockComplete { - Monitor *mon; - const char *input; -} MonitorBlockComplete; - -static void block_completion_it(void *opaque, BlockDriverState *bs) -{ - const char *name =3D bdrv_get_device_name(bs); - MonitorBlockComplete *mbc =3D opaque; - Monitor *mon =3D mbc->mon; - const char *input =3D mbc->input; - - if (input[0] =3D=3D '\0' || - !strncmp(name, (char *)input, strlen(input))) { - readline_add_completion(mon->rs, name); - } -} - static const char *next_arg_type(const char *typestr) { const char *p =3D strchr(typestr, ':'); @@ -4671,9 +4653,9 @@ static void monitor_find_completion_by_table(Monito= r *mon, { const char *cmdname; int i; - const char *ptype, *str; + const char *ptype, *str, *name; const mon_cmd_t *cmd; - MonitorBlockComplete mbs; + BlockDriverState *bs; =20 if (nb_args <=3D 1) { /* command completion */ @@ -4725,10 +4707,14 @@ static void monitor_find_completion_by_table(Moni= tor *mon, break; case 'B': /* block device name completion */ - mbs.mon =3D mon; - mbs.input =3D str; readline_set_completion_index(mon->rs, strlen(str)); - bdrv_iterate(block_completion_it, &mbs); + for (bs =3D bdrv_next(NULL); bs; bs =3D bdrv_next(bs)) { + name =3D bdrv_get_device_name(bs); + if (str[0] =3D=3D '\0' || + !strncmp(name, str, strlen(str))) { + readline_add_completion(mon->rs, name); + } + } break; case 's': case 'S': --=20 1.9.3