From patchwork Fri Apr 23 15:30:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 50842 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D1880B7D25 for ; Sat, 24 Apr 2010 02:24:06 +1000 (EST) Received: from localhost ([127.0.0.1]:55791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5LXa-0002rs-Qa for incoming@patchwork.ozlabs.org; Fri, 23 Apr 2010 12:15:42 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O5Krf-0007hu-Kl for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:23 -0400 Received: from [140.186.70.92] (port=50563 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5Krd-0007gt-TF for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O5Krc-0005zo-0s for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46821) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O5Kra-0005zU-Px for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:19 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3NFWHZa026227 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 23 Apr 2010 11:32:17 -0400 Received: from localhost.localdomain (vpn2-9-155.ams2.redhat.com [10.36.9.155]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3NFVOCQ020467; Fri, 23 Apr 2010 11:32:15 -0400 From: Kevin Wolf To: aliguori@linux.vnet.ibm.com Date: Fri, 23 Apr 2010 17:30:53 +0200 Message-Id: <1272036658-26776-22-git-send-email-kwolf@redhat.com> In-Reply-To: <1272036658-26776-1-git-send-email-kwolf@redhat.com> References: <1272036658-26776-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 21/26] block: Convert first_drv to QLIST X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- 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 {