[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 22/42] block: Use CAFs in bdrv_get_allocated_file
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v5 22/42] block: Use CAFs in bdrv_get_allocated_file_size() |
Date: |
Thu, 13 Jun 2019 00:09:44 +0200 |
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 11b7ba8cf6..856d9b58be 100644
--- a/block.c
+++ b/block.c
@@ -4511,15 +4511,37 @@ exit:
int64_t bdrv_get_allocated_file_size(BlockDriverState *bs)
{
BlockDriver *drv = bs->drv;
+ BlockDriverState *storage_bs, *metadata_bs;
+
if (!drv) {
return -ENOMEDIUM;
}
+
if (drv->bdrv_get_allocated_file_size) {
return drv->bdrv_get_allocated_file_size(bs);
}
- if (bs->file) {
- return bdrv_get_allocated_file_size(bs->file->bs);
+
+ storage_bs = bdrv_storage_bs(bs);
+ metadata_bs = bdrv_metadata_bs(bs);
+
+ if (storage_bs) {
+ int64_t data_size, metadata_size = 0;
+
+ data_size = bdrv_get_allocated_file_size(storage_bs);
+ if (data_size < 0) {
+ return data_size;
+ }
+
+ if (storage_bs != metadata_bs) {
+ metadata_size = bdrv_get_allocated_file_size(metadata_bs);
+ if (metadata_size < 0) {
+ return metadata_size;
+ }
+ }
+
+ return data_size + metadata_size;
}
+
return -ENOTSUP;
}
--
2.21.0
- Re: [Qemu-devel] [PATCH v5 21/42] block: Use CAFs for debug breakpoints, (continued)
[Qemu-devel] [PATCH v5 20/42] block/snapshot: Fall back to storage child, Max Reitz, 2019/06/12
[Qemu-devel] [PATCH v5 23/42] blockdev: Use CAF in external_snapshot_prepare(), Max Reitz, 2019/06/12
[Qemu-devel] [PATCH v5 22/42] block: Use CAFs in bdrv_get_allocated_file_size(),
Max Reitz <=
[Qemu-devel] [PATCH v5 25/42] mirror: Deal with filters, Max Reitz, 2019/06/12
[Qemu-devel] [PATCH v5 24/42] block: Use child access functions for QAPI queries, Max Reitz, 2019/06/12