From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O1cRO-0008Pi-7X for qemu-devel@nongnu.org; Tue, 13 Apr 2010 05:29:54 -0400 Received: from [140.186.70.92] (port=35818 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1cRM-0008PD-8c for qemu-devel@nongnu.org; Tue, 13 Apr 2010 05:29:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O1cQZ-0001JN-3c for qemu-devel@nongnu.org; Tue, 13 Apr 2010 05:29:09 -0400 Received: from mtagate4.de.ibm.com ([195.212.17.164]:34979) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O1cQY-0001J4-Qr for qemu-devel@nongnu.org; Tue, 13 Apr 2010 05:29:03 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate4.de.ibm.com (8.13.1/8.13.1) with ESMTP id o3D9T1V1019743 for ; Tue, 13 Apr 2010 09:29:01 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o3D9T1w91593356 for ; Tue, 13 Apr 2010 11:29:01 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id o3D9T1v7025531 for ; Tue, 13 Apr 2010 11:29:01 +0200 From: Stefan Hajnoczi Date: Tue, 13 Apr 2010 10:29:33 +0100 Message-Id: <1271150975-4456-2-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1271150975-4456-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1271150975-4456-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 1/3] block: Convert first_drv to QLIST List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi --- block.c | 22 ++++++++++++---------- block_int.h | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/block.c b/block.c index 5d087de..12cf434 100644 --- a/block.c +++ b/block.c @@ -58,7 +58,8 @@ static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num, static QTAILQ_HEAD(, BlockDriverState) bdrv_states = QTAILQ_HEAD_INITIALIZER(bdrv_states); -static BlockDriver *first_drv; +static QLIST_HEAD(, BlockDriver) bdrv_drivers = + QLIST_HEAD_INITIALIZER(bdrv_drivers); /* If non-zero, use only whitelisted block drivers */ static int use_bdrv_whitelist; @@ -142,8 +143,7 @@ void bdrv_register(BlockDriver *bdrv) if (!bdrv->bdrv_aio_flush) bdrv->bdrv_aio_flush = bdrv_aio_flush_em; - bdrv->next = first_drv; - first_drv = bdrv; + QLIST_INSERT_HEAD(&bdrv_drivers, bdrv, list); } /* create a new block device (by default it is empty) */ @@ -162,9 +162,10 @@ BlockDriverState *bdrv_new(const char *device_name) BlockDriver *bdrv_find_format(const char *format_name) { BlockDriver *drv1; - for(drv1 = first_drv; drv1 != NULL; drv1 = drv1->next) { - if (!strcmp(drv1->format_name, format_name)) + QLIST_FOREACH(drv1, &bdrv_drivers, list) { + if (!strcmp(drv1->format_name, format_name)) { return drv1; + } } return NULL; } @@ -265,10 +266,11 @@ static BlockDriver *find_protocol(const char *filename) len = sizeof(protocol) - 1; memcpy(protocol, filename, len); protocol[len] = '\0'; - for(drv1 = first_drv; drv1 != NULL; drv1 = drv1->next) { + QLIST_FOREACH(drv1, &bdrv_drivers, list) { if (drv1->protocol_name && - !strcmp(drv1->protocol_name, protocol)) + !strcmp(drv1->protocol_name, protocol)) { return drv1; + } } return NULL; } @@ -282,7 +284,7 @@ static BlockDriver *find_hdev_driver(const char *filename) int score_max = 0, score; BlockDriver *drv = NULL, *d; - for (d = first_drv; d; d = d->next) { + QLIST_FOREACH(d, &bdrv_drivers, list) { if (d->bdrv_probe_device) { score = d->bdrv_probe_device(filename); if (score > score_max) { @@ -317,7 +319,7 @@ static BlockDriver *find_image_format(const char *filename) } score_max = 0; - for(drv1 = first_drv; drv1 != NULL; drv1 = drv1->next) { + QLIST_FOREACH(drv1, &bdrv_drivers, list) { if (drv1->bdrv_probe) { score = drv1->bdrv_probe(buf, ret, filename); if (score > score_max) { @@ -1157,7 +1159,7 @@ void bdrv_iterate_format(void (*it)(void *opaque, const char *name), { BlockDriver *drv; - for (drv = first_drv; drv != NULL; drv = drv->next) { + QLIST_FOREACH(drv, &bdrv_drivers, list) { it(opaque, drv->format_name); } } diff --git a/block_int.h b/block_int.h index 466a38c..d4067ff 100644 --- a/block_int.h +++ b/block_int.h @@ -126,7 +126,7 @@ struct BlockDriver { /* Set if newly created images are not guaranteed to contain only zeros */ int no_zero_init; - struct BlockDriver *next; + QLIST_ENTRY(BlockDriver) list; }; struct BlockDriverState { -- 1.7.0