Le 13/10/2020 à 03:34, Li Qiang a écrit :
> Laurent Vivier <laur...@vivier.eu> 于2020年10月12日周一 下午11:33写道：
>>
>> Le 10/10/2020 à 13:07, Chen Qun a écrit :
>>> This if statement judgment is redundant and it will cause a warning:
>>>
>>> migration/block-dirty-bitmap.c:1090:13: warning: ‘bitmap_name’ may be used
>>> uninitialized in this function [-Wmaybe-uninitialized]
>>> g_strlcpy(s->bitmap_name, bitmap_name, sizeof(s->bitmap_name));
>>> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>
>>> Reported-by: Euler Robot <euler.ro...@huawei.com>
>>> Signed-off-by: Chen Qun <kuhn.chen...@huawei.com>
>>> ---
>>> migration/block-dirty-bitmap.c | 2 --
>>> 1 file changed, 2 deletions(-)
>>>
>>> diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
>>> index 5bef793ac0..e09ea4f22b 100644
>>> --- a/migration/block-dirty-bitmap.c
>>> +++ b/migration/block-dirty-bitmap.c
>>> @@ -1084,9 +1084,7 @@ static int dirty_bitmap_load_header(QEMUFile *f,
>>> DBMLoadState *s,
>>> } else {
>>> bitmap_name = s->bitmap_alias;
>>> }
>>> - }
>>>
>>> - if (!s->cancelled) {
>>> g_strlcpy(s->bitmap_name, bitmap_name, sizeof(s->bitmap_name));
>>> s->bitmap = bdrv_find_dirty_bitmap(s->bs, s->bitmap_name);
>>>
>>>
>>
>> I don't think it's correct as "cancel_incoming_locked(s)" can change the
>> value of "s->cancelled".
>>
>
> Hi Laurent,
>
> You're right. So I think this can simply assign 'bitmap_name' to NULL
> to make compiler happy.
Yes, and adding a comment before the second "if (!s->cancelled) {" to
explain the value can be changed by "cancel_incoming_locked(s)" would
avoid to have this kind of patch posted regularly to the ML.
Thanks,
Laurent
