[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/11] block: simplify bdrv_find_base()
From: |
Jeff Cody |
Subject: |
[Qemu-devel] [PATCH v2 05/11] block: simplify bdrv_find_base() |
Date: |
Tue, 27 May 2014 10:28:35 -0400 |
This simplifies the function bdrv_find_base(), while keeping the
same functionality.
Signed-off-by: Jeff Cody <address@hidden>
---
block.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/block.c b/block.c
index 577d4f1..cf29494 100644
--- a/block.c
+++ b/block.c
@@ -4363,20 +4363,14 @@ int bdrv_get_backing_file_depth(BlockDriverState *bs)
return 1 + bdrv_get_backing_file_depth(bs->backing_hd);
}
+/* Given a BDS, searches for the base layer. If
+ * base layer cannot be found, returns NULL */
BlockDriverState *bdrv_find_base(BlockDriverState *bs)
{
- BlockDriverState *curr_bs = NULL;
-
- if (!bs) {
- return NULL;
+ while (bs && bs->backing_hd) {
+ bs = bs->backing_hd;
}
-
- curr_bs = bs;
-
- while (curr_bs->backing_hd) {
- curr_bs = curr_bs->backing_hd;
- }
- return curr_bs;
+ return bs;
}
/* Given a BDS, searches for the active layer. If
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/11] Modify block jobs to use node-names, Jeff Cody, 2014/05/27
- [Qemu-devel] [PATCH v2 01/11] block: Auto-generate node_names for each BDS entry, Jeff Cody, 2014/05/27
- [Qemu-devel] [PATCH v2 02/11] block: add helper function to determine if a BDS is in a chain, Jeff Cody, 2014/05/27
- [Qemu-devel] [PATCH v2 03/11] block: Add overlay BDS pointer into the BlockDriverState struct, Jeff Cody, 2014/05/27
- [Qemu-devel] [PATCH v2 04/11] block: add helper function to find the active layer of any BDS, Jeff Cody, 2014/05/27
- [Qemu-devel] [PATCH v2 05/11] block: simplify bdrv_find_base(),
Jeff Cody <=
- [Qemu-devel] [PATCH v2 06/11] block: make 'top' argument to block-commit optional, Jeff Cody, 2014/05/27
- [Qemu-devel] [PATCH v2 08/11] block: extend block-commit to accept a string for the backing file, Jeff Cody, 2014/05/27
- [Qemu-devel] [PATCH v2 07/11] block: Accept node-name arguments for block-commit, Jeff Cody, 2014/05/27
- [Qemu-devel] [PATCH v2 09/11] block: add ability for block-stream to use node-name, Jeff Cody, 2014/05/27