[Qemu-devel] [PATCH 1/2] Fix QCOW2 debugging code to compile with DEBUG_ALLOC defined.

[Qemu-devel] [PATCH 1/2] Fix QCOW2 debugging code to compile with DEBUG_ALLOC defined.

[Filip Navara]

Signed-off-by: Filip Navara <filip.navara@gmail.com>
---
 block/qcow2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index 9acbddf..fdcd20b 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -251,7 +251,7 @@ static int qcow_open(BlockDriverState *bs, const char *filename, int flags)
         goto fail;
 
 #ifdef DEBUG_ALLOC
-    check_refcounts(bs);
+    qcow2_check_refcounts(bs);
 #endif
     return 0;
 
-- 
1.6.3.msysgit.0

Re: [Qemu-devel] [PATCH 1/2] Fix QCOW2 debugging code to compile with DEBUG_ALLOC defined.

[Kevin Wolf]

Filip Navara schrieb:
> Signed-off-by: Filip Navara <filip.navara@gmail.com>
> ---
>  block/qcow2.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/block/qcow2.c b/block/qcow2.c
> index 9acbddf..fdcd20b 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -251,7 +251,7 @@ static int qcow_open(BlockDriverState *bs, const char *filename, int flags)
>          goto fail;
>  
>  #ifdef DEBUG_ALLOC
> -    check_refcounts(bs);
> +    qcow2_check_refcounts(bs);
>  #endif
>      return 0;
>  

Good point. However, this is not complete. During the qcow2 source split
the #ifdefs have been spread over the files, but the #define hasn't
moved to qcow2.h. To fix debugging you should move it there and fix the
additional compile errors in the other files, too. Also, defining
DEBUG_ALLOC2 gives even more errors, so maybe they should handled here
as well.

Kevin

Re: [Qemu-devel] [PATCH 1/2] Fix QCOW2 debugging code to compile with DEBUG_ALLOC defined.

[Filip Navara]

On Tue, Jun 23, 2009 at 4:44 PM, Kevin Wolf<kwolf@redhat.com> wrote:
> Filip Navara schrieb:
>> Signed-off-by: Filip Navara <filip.navara@gmail.com>
>> ---
>>  block/qcow2.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/block/qcow2.c b/block/qcow2.c
>> index 9acbddf..fdcd20b 100644
>> --- a/block/qcow2.c
>> +++ b/block/qcow2.c
>> @@ -251,7 +251,7 @@ static int qcow_open(BlockDriverState *bs, const char *filename, int flags)
>>          goto fail;
>>
>>  #ifdef DEBUG_ALLOC
>> -    check_refcounts(bs);
>> +    qcow2_check_refcounts(bs);
>>  #endif
>>      return 0;
>>
>
> Good point. However, this is not complete. During the qcow2 source split
> the #ifdefs have been spread over the files, but the #define hasn't
> moved to qcow2.h. To fix debugging you should move it there and fix the
> additional compile errors in the other files, too. Also, defining
> DEBUG_ALLOC2 gives even more errors, so maybe they should handled here
> as well.
>
> Kevin

I have sent a new patch that fixes all the QCOW2 debugging code in my
environment and moves the definitions to qcow2.h. Thanks for comments.

Best regards,
Filip Navara