From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LfMYY-0008A7-KV for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:00:46 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LfMYX-00089L-LF for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:00:45 -0500 Received: from [199.232.76.173] (port=43405 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LfMYX-00089B-Bp for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:00:45 -0500 Received: from savannah.gnu.org ([199.232.41.3]:59792 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LfMYW-0005YY-U7 for qemu-devel@nongnu.org; Thu, 05 Mar 2009 18:00:45 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LfMYW-0000eg-8f for qemu-devel@nongnu.org; Thu, 05 Mar 2009 23:00:44 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LfMYV-0000eD-UT for qemu-devel@nongnu.org; Thu, 05 Mar 2009 23:00:44 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Thu, 05 Mar 2009 23:00:43 +0000 Subject: [Qemu-devel] [6703] block: Improve bdrv_iterate (Jan Kiszka) Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 6703 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6703 Author: aliguori Date: 2009-03-05 23:00:43 +0000 (Thu, 05 Mar 2009) Log Message: ----------- block: Improve bdrv_iterate (Jan Kiszka) Make bdrv_iterate more useful by passing the BlockDriverState to the iterator instead of the device name. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori Modified Paths: -------------- trunk/block.c trunk/block.h trunk/monitor.c Modified: trunk/block.c =================================================================== --- trunk/block.c 2009-03-05 23:00:29 UTC (rev 6702) +++ trunk/block.c 2009-03-05 23:00:43 UTC (rev 6703) @@ -1011,12 +1011,12 @@ return NULL; } -void bdrv_iterate(void (*it)(void *opaque, const char *name), void *opaque) +void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), void *opaque) { BlockDriverState *bs; for (bs = bdrv_first; bs != NULL; bs = bs->next) { - it(opaque, bs->device_name); + it(opaque, bs); } } Modified: trunk/block.h =================================================================== --- trunk/block.h 2009-03-05 23:00:29 UTC (rev 6702) +++ trunk/block.h 2009-03-05 23:00:43 UTC (rev 6703) @@ -141,7 +141,8 @@ void (*change_cb)(void *opaque), void *opaque); void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size); BlockDriverState *bdrv_find(const char *name); -void bdrv_iterate(void (*it)(void *opaque, const char *name), void *opaque); +void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), + void *opaque); int bdrv_is_encrypted(BlockDriverState *bs); int bdrv_set_key(BlockDriverState *bs, const char *key); void bdrv_iterate_format(void (*it)(void *opaque, const char *name), Modified: trunk/monitor.c =================================================================== --- trunk/monitor.c 2009-03-05 23:00:29 UTC (rev 6702) +++ trunk/monitor.c 2009-03-05 23:00:43 UTC (rev 6703) @@ -2679,8 +2679,9 @@ closedir(ffs); } -static void block_completion_it(void *opaque, const char *name) +static void block_completion_it(void *opaque, BlockDriverState *bs) { + const char *name = bdrv_get_device_name(bs); const char *input = opaque; if (input[0] == '\0' ||