From patchwork Fri Apr 9 14:22:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 49851 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 2D83AB7CF8 for ; Sat, 10 Apr 2010 01:59:01 +1000 (EST) Received: from localhost ([127.0.0.1]:40543 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O0GRD-0007nV-Gv for incoming@patchwork.ozlabs.org; Fri, 09 Apr 2010 11:48:07 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O0F5d-0004pu-7d for qemu-devel@nongnu.org; Fri, 09 Apr 2010 10:21:45 -0400 Received: from [140.186.70.92] (port=43220 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O0F5b-0004o1-Df for qemu-devel@nongnu.org; Fri, 09 Apr 2010 10:21:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O0F5Y-0006Uy-08 for qemu-devel@nongnu.org; Fri, 09 Apr 2010 10:21:43 -0400 Received: from mtagate4.de.ibm.com ([195.212.17.164]:42968) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O0F5X-0006UJ-O9 for qemu-devel@nongnu.org; Fri, 09 Apr 2010 10:21:39 -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 o39ELbM2014811 for ; Fri, 9 Apr 2010 14:21:37 GMT Received: from d12av03.megacenter.de.ibm.com (d12av03.megacenter.de.ibm.com [9.149.165.213]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o39ELbEa1347762 for ; Fri, 9 Apr 2010 16:21:37 +0200 Received: from d12av03.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av03.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id o39ELbBh030361 for ; Fri, 9 Apr 2010 16:21:37 +0200 Received: from localhost.localdomain (dyn-9-174-219-79.manchester-maybrook.uk.ibm.com [9.174.219.79]) by d12av03.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id o39ELalH030332; Fri, 9 Apr 2010 16:21:37 +0200 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Fri, 9 Apr 2010 15:22:14 +0100 Message-Id: <1270822934-8623-3-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1270822934-8623-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1270822934-8623-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Mailman-Approved-At: Fri, 09 Apr 2010 11:39:34 -0400 Cc: Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 2/2] block: Convert bdrv_first to QTAILQ 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 Signed-off-by: Stefan Hajnoczi --- block.c | 44 +++++++++++++++++++++++--------------------- block_int.h | 3 ++- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/block.c b/block.c index 61da183..86d2504 100644 --- a/block.c +++ b/block.c @@ -55,7 +55,8 @@ static int bdrv_read_em(BlockDriverState *bs, int64_t sector_num, static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num, const uint8_t *buf, int nb_sectors); -static BlockDriverState *bdrv_first; +static QTAILQ_HEAD(, BlockDriverState) bdrv_states = + QTAILQ_HEAD_INITIALIZER(bdrv_states); static BlockDriver *first_drv; @@ -148,16 +149,12 @@ void bdrv_register(BlockDriver *bdrv) /* create a new block device (by default it is empty) */ BlockDriverState *bdrv_new(const char *device_name) { - BlockDriverState **pbs, *bs; + BlockDriverState *bs; bs = qemu_mallocz(sizeof(BlockDriverState)); pstrcpy(bs->device_name, sizeof(bs->device_name), device_name); if (device_name[0] != '\0') { - /* insert at the end */ - pbs = &bdrv_first; - while (*pbs != NULL) - pbs = &(*pbs)->next; - *pbs = bs; + QTAILQ_INSERT_TAIL(&bdrv_states, bs, list); } return bs; } @@ -545,13 +542,15 @@ void bdrv_close(BlockDriverState *bs) void bdrv_delete(BlockDriverState *bs) { - BlockDriverState **pbs; + BlockDriverState *bs1; - pbs = &bdrv_first; - while (*pbs != bs && *pbs != NULL) - pbs = &(*pbs)->next; - if (*pbs == bs) - *pbs = bs->next; + /* remove from list, if necessary */ + QTAILQ_FOREACH(bs1, &bdrv_states, list) { + if (bs1 == bs) { + QTAILQ_REMOVE(&bdrv_states, bs, list); + break; + } + } bdrv_close(bs); qemu_free(bs); @@ -1172,9 +1171,10 @@ BlockDriverState *bdrv_find(const char *name) { BlockDriverState *bs; - for (bs = bdrv_first; bs != NULL; bs = bs->next) { - if (!strcmp(name, bs->device_name)) + QTAILQ_FOREACH(bs, &bdrv_states, list) { + if (!strcmp(name, bs->device_name)) { return bs; + } } return NULL; } @@ -1183,7 +1183,7 @@ void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), void *opaque) { BlockDriverState *bs; - for (bs = bdrv_first; bs != NULL; bs = bs->next) { + QTAILQ_FOREACH(bs, &bdrv_states, list) { it(opaque, bs); } } @@ -1203,10 +1203,12 @@ void bdrv_flush_all(void) { BlockDriverState *bs; - for (bs = bdrv_first; bs != NULL; bs = bs->next) - if (bs->drv && !bdrv_is_read_only(bs) && - (!bdrv_is_removable(bs) || bdrv_is_inserted(bs))) + QTAILQ_FOREACH(bs, &bdrv_states, list) { + if (bs->drv && !bdrv_is_read_only(bs) && + (!bdrv_is_removable(bs) || bdrv_is_inserted(bs))) { bdrv_flush(bs); + } + } } /* @@ -1340,7 +1342,7 @@ void bdrv_info(Monitor *mon, QObject **ret_data) bs_list = qlist_new(); - for (bs = bdrv_first; bs != NULL; bs = bs->next) { + QTAILQ_FOREACH(bs, &bdrv_states, list) { QObject *bs_obj; const char *type = "unknown"; @@ -1445,7 +1447,7 @@ void bdrv_info_stats(Monitor *mon, QObject **ret_data) devices = qlist_new(); - for (bs = bdrv_first; bs != NULL; bs = bs->next) { + QTAILQ_FOREACH(bs, &bdrv_states, list) { obj = qobject_from_jsonf("{ 'device': %s, 'stats': {" "'rd_bytes': %" PRId64 "," "'wr_bytes': %" PRId64 "," diff --git a/block_int.h b/block_int.h index d5a808d..466a38c 100644 --- a/block_int.h +++ b/block_int.h @@ -26,6 +26,7 @@ #include "block.h" #include "qemu-option.h" +#include "qemu-queue.h" #define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_COMPRESS 2 @@ -180,7 +181,7 @@ struct BlockDriverState { char device_name[32]; unsigned long *dirty_bitmap; int64_t dirty_count; - BlockDriverState *next; + QTAILQ_ENTRY(BlockDriverState) list; void *private; };