[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 04/10] qcow2: Reuse refcount table in calcula
From: |
Benoît Canet |
Subject: |
Re: [Qemu-devel] [PATCH v3 04/10] qcow2: Reuse refcount table in calculate_refcounts() |
Date: |
Fri, 22 Aug 2014 18:07:58 +0000 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Fri, Aug 22, 2014 at 06:31:38PM +0200, Max Reitz wrote:
> We will later call calculate_refcounts multiple times, so reuse the
> refcount table if possible.
>
> Signed-off-by: Max Reitz <address@hidden>
> ---
> block/qcow2-refcount.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
> index 2b728ef..babe6cb 100644
> --- a/block/qcow2-refcount.c
> +++ b/block/qcow2-refcount.c
> @@ -1584,10 +1584,12 @@ static int calculate_refcounts(BlockDriverState *bs,
> BdrvCheckResult *res,
> QCowSnapshot *sn;
> int ret;
>
> - *refcount_table = g_try_new0(uint16_t, *nb_clusters);
> - if (*nb_clusters && *refcount_table == NULL) {
> - res->check_errors++;
> - return -ENOMEM;
> + if (!*refcount_table) {
> + *refcount_table = g_try_new0(uint16_t, *nb_clusters);
> + if (*nb_clusters && *refcount_table == NULL) {
> + res->check_errors++;
> + return -ENOMEM;
> + }
> }
>
> /* header */
> @@ -1694,7 +1696,7 @@ int qcow2_check_refcounts(BlockDriverState *bs,
> BdrvCheckResult *res,
> {
> BDRVQcowState *s = bs->opaque;
> int64_t size, highest_cluster, nb_clusters;
> - uint16_t *refcount_table;
> + uint16_t *refcount_table = NULL;
> int ret;
>
> size = bdrv_getlength(bs->file);
> --
> 2.0.4
>
Reviewed-by: Benoît Canet <address@hidden>
- [Qemu-devel] [PATCH v3 00/10] qcow2: Fix image repairing, Max Reitz, 2014/08/22
- [Qemu-devel] [PATCH v3 01/10] qcow2: Fix leaks in dirty images, Max Reitz, 2014/08/22
- [Qemu-devel] [PATCH v3 02/10] qcow2: Split qcow2_check_refcounts(), Max Reitz, 2014/08/22
- [Qemu-devel] [PATCH v3 03/10] qcow2: Pull check_refblocks() up, Max Reitz, 2014/08/22
- [Qemu-devel] [PATCH v3 04/10] qcow2: Reuse refcount table in calculate_refcounts(), Max Reitz, 2014/08/22
- Re: [Qemu-devel] [PATCH v3 04/10] qcow2: Reuse refcount table in calculate_refcounts(),
Benoît Canet <=
- [Qemu-devel] [PATCH v3 05/10] qcow2: Fix refcount blocks beyond image end, Max Reitz, 2014/08/22
- [Qemu-devel] [PATCH v3 06/10] qcow2: Do not perform potentially damaging repairs, Max Reitz, 2014/08/22
- [Qemu-devel] [PATCH v3 07/10] qcow2: Rebuild refcount structure during check, Max Reitz, 2014/08/22
- [Qemu-devel] [PATCH v3 08/10] qcow2: Clean up after refcount rebuild, Max Reitz, 2014/08/22