1. Patchew
  2. QEMU
  3. [PATCH v2 00/22] Fix error handling during bitmap postcopy
  4. View patch

[PATCH v2 03/22] migration/block-dirty-bitmap: rename dirty_bitmap_mig_cleanup

Vladimir Sementsov-Ogievskiy posted 22 patches 5 years, 11 months ago
There is a newer version of this series
[PATCH v2 03/22] migration/block-dirty-bitmap: rename dirty_bitmap_mig_cleanup
Posted by Vladimir Sementsov-Ogievskiy 5 years, 11 months ago 
Rename dirty_bitmap_mig_cleanup to dirty_bitmap_do_save_cleanup, to
stress that it is on save part.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 migration/block-dirty-bitmap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index 73792ab005..4e8959ae52 100644
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -259,7 +259,7 @@ static void send_bitmap_bits(QEMUFile *f, SaveBitmapState *dbms,
 }
 
 /* Called with iothread lock taken.  */
-static void dirty_bitmap_mig_cleanup(void)
+static void dirty_bitmap_do_save_cleanup(void)
 {
     SaveBitmapState *dbms;
 
@@ -338,7 +338,7 @@ static int init_dirty_bitmap_migration(void)
     return 0;
 
 fail:
-    dirty_bitmap_mig_cleanup();
+    dirty_bitmap_do_save_cleanup();
 
     return -1;
 }
@@ -377,7 +377,7 @@ static void bulk_phase(QEMUFile *f, bool limit)
 /* for SaveVMHandlers */
 static void dirty_bitmap_save_cleanup(void *opaque)
 {
-    dirty_bitmap_mig_cleanup();
+    dirty_bitmap_do_save_cleanup();
 }
 
 static int dirty_bitmap_save_iterate(QEMUFile *f, void *opaque)
@@ -412,7 +412,7 @@ static int dirty_bitmap_save_complete(QEMUFile *f, void *opaque)
 
     trace_dirty_bitmap_save_complete_finish();
 
-    dirty_bitmap_mig_cleanup();
+    dirty_bitmap_do_save_cleanup();
     return 0;
 }
 
-- 
2.21.0
Re: [PATCH v2 03/22] migration/block-dirty-bitmap: rename dirty_bitmap_mig_cleanup
Posted by Andrey Shinkevich 5 years, 11 months ago 
On 17/02/2020 18:02, Vladimir Sementsov-Ogievskiy wrote:
> Rename dirty_bitmap_mig_cleanup to dirty_bitmap_do_save_cleanup, to
> stress that it is on save part.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
>   migration/block-dirty-bitmap.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
> index 73792ab005..4e8959ae52 100644
> --- a/migration/block-dirty-bitmap.c
> +++ b/migration/block-dirty-bitmap.c
> @@ -259,7 +259,7 @@ static void send_bitmap_bits(QEMUFile *f, SaveBitmapState *dbms,
>   }
>   
>   /* Called with iothread lock taken.  */
> -static void dirty_bitmap_mig_cleanup(void)
> +static void dirty_bitmap_do_save_cleanup(void)
>   {
>       SaveBitmapState *dbms;
>   
> @@ -338,7 +338,7 @@ static int init_dirty_bitmap_migration(void)
>       return 0;
>   
>   fail:
> -    dirty_bitmap_mig_cleanup();
> +    dirty_bitmap_do_save_cleanup();
>   
>       return -1;
>   }
> @@ -377,7 +377,7 @@ static void bulk_phase(QEMUFile *f, bool limit)
>   /* for SaveVMHandlers */
>   static void dirty_bitmap_save_cleanup(void *opaque)
>   {
> -    dirty_bitmap_mig_cleanup();
> +    dirty_bitmap_do_save_cleanup();
>   }
>   
>   static int dirty_bitmap_save_iterate(QEMUFile *f, void *opaque)
> @@ -412,7 +412,7 @@ static int dirty_bitmap_save_complete(QEMUFile *f, void *opaque)
>   
>       trace_dirty_bitmap_save_complete_finish();
>   
> -    dirty_bitmap_mig_cleanup();
> +    dirty_bitmap_do_save_cleanup();
>       return 0;
>   }
>   
> 

At the next opportunity, I would suggest the name like
"dirty_bitmap_do_clean_after_saving()"
and similar for dirty_bitmap_save_cleanup()
"dirty_bitmap_clean_after_saving()".

Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
-- 
With the best regards,
Andrey Shinkevich
Re: [PATCH v2 03/22] migration/block-dirty-bitmap: rename dirty_bitmap_mig_cleanup
Posted by Vladimir Sementsov-Ogievskiy 5 years, 11 months ago 
18.02.2020 14:00, Andrey Shinkevich wrote:
> On 17/02/2020 18:02, Vladimir Sementsov-Ogievskiy wrote:
>> Rename dirty_bitmap_mig_cleanup to dirty_bitmap_do_save_cleanup, to
>> stress that it is on save part.
>>
>> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
>> ---
>>   migration/block-dirty-bitmap.c | 8 ++++----
>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
>> index 73792ab005..4e8959ae52 100644
>> --- a/migration/block-dirty-bitmap.c
>> +++ b/migration/block-dirty-bitmap.c
>> @@ -259,7 +259,7 @@ static void send_bitmap_bits(QEMUFile *f, SaveBitmapState *dbms,
>>   }
>>   /* Called with iothread lock taken.  */
>> -static void dirty_bitmap_mig_cleanup(void)
>> +static void dirty_bitmap_do_save_cleanup(void)
>>   {
>>       SaveBitmapState *dbms;
>> @@ -338,7 +338,7 @@ static int init_dirty_bitmap_migration(void)
>>       return 0;
>>   fail:
>> -    dirty_bitmap_mig_cleanup();
>> +    dirty_bitmap_do_save_cleanup();
>>       return -1;
>>   }
>> @@ -377,7 +377,7 @@ static void bulk_phase(QEMUFile *f, bool limit)
>>   /* for SaveVMHandlers */
>>   static void dirty_bitmap_save_cleanup(void *opaque)
>>   {
>> -    dirty_bitmap_mig_cleanup();
>> +    dirty_bitmap_do_save_cleanup();
>>   }
>>   static int dirty_bitmap_save_iterate(QEMUFile *f, void *opaque)
>> @@ -412,7 +412,7 @@ static int dirty_bitmap_save_complete(QEMUFile *f, void *opaque)
>>       trace_dirty_bitmap_save_complete_finish();
>> -    dirty_bitmap_mig_cleanup();
>> +    dirty_bitmap_do_save_cleanup();
>>       return 0;
>>   }
>>
> 
> At the next opportunity, I would suggest the name like
> "dirty_bitmap_do_clean_after_saving()"
> and similar for dirty_bitmap_save_cleanup()
> "dirty_bitmap_clean_after_saving()".

I'd keep my naming, it corresponds to .save_cleanup handler name.

> 
> Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>


-- 
Best regards,
Vladimir
Re: [PATCH v2 03/22] migration/block-dirty-bitmap: rename dirty_bitmap_mig_cleanup
Posted by Eric Blake 5 years, 6 months ago 
On 2/19/20 8:20 AM, Vladimir Sementsov-Ogievskiy wrote:
> 18.02.2020 14:00, Andrey Shinkevich wrote:
>> On 17/02/2020 18:02, Vladimir Sementsov-Ogievskiy wrote:
>>> Rename dirty_bitmap_mig_cleanup to dirty_bitmap_do_save_cleanup, to
>>> stress that it is on save part.
>>>
>>> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
>>> ---
>>>   migration/block-dirty-bitmap.c | 8 ++++----
>>>   1 file changed, 4 insertions(+), 4 deletions(-)

>>
>> At the next opportunity, I would suggest the name like
>> "dirty_bitmap_do_clean_after_saving()"
>> and similar for dirty_bitmap_save_cleanup()
>> "dirty_bitmap_clean_after_saving()".
> 
> I'd keep my naming, it corresponds to .save_cleanup handler name.

I'm fine with that explanation, so no need to rename again.

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
>>
>> Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
> 
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.