[PATCH] migration: Fix typos in bitmap migration comments

Eric Blake posted 1 patch 3 years, 9 months ago
Failed in applying to current master (apply log)
migration/block-dirty-bitmap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] migration: Fix typos in bitmap migration comments
Posted by Eric Blake 3 years, 9 months ago
Noticed while reviewing the file for newer patches.

Fixes: b35ebdf076
Signed-off-by: Eric Blake <eblake@redhat.com>
---

This is trivial enough that I'll throw it in my pull request today.

 migration/block-dirty-bitmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index 1f675b792fc9..784330ebe130 100644
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -97,7 +97,7 @@

 #define DIRTY_BITMAP_MIG_START_FLAG_ENABLED          0x01
 #define DIRTY_BITMAP_MIG_START_FLAG_PERSISTENT       0x02
-/* 0x04 was "AUTOLOAD" flags on elder versions, no it is ignored */
+/* 0x04 was "AUTOLOAD" flags on older versions, now it is ignored */
 #define DIRTY_BITMAP_MIG_START_FLAG_RESERVED_MASK    0xf8

 /* State of one bitmap during save process */
@@ -180,7 +180,7 @@ static uint32_t qemu_get_bitmap_flags(QEMUFile *f)

 static void qemu_put_bitmap_flags(QEMUFile *f, uint32_t flags)
 {
-    /* The code currently do not send flags more than one byte */
+    /* The code currently does not send flags as more than one byte */
     assert(!(flags & (0xffffff00 | DIRTY_BITMAP_MIG_EXTRA_FLAGS)));

     qemu_put_byte(f, flags);
-- 
2.27.0


Re: [PATCH] migration: Fix typos in bitmap migration comments
Posted by Vladimir Sementsov-Ogievskiy 3 years, 9 months ago
27.07.2020 23:32, Eric Blake wrote:
> Noticed while reviewing the file for newer patches.
> 
> Fixes: b35ebdf076
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
> 
> This is trivial enough that I'll throw it in my pull request today.
> 
>   migration/block-dirty-bitmap.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
> index 1f675b792fc9..784330ebe130 100644
> --- a/migration/block-dirty-bitmap.c
> +++ b/migration/block-dirty-bitmap.c
> @@ -97,7 +97,7 @@
> 
>   #define DIRTY_BITMAP_MIG_START_FLAG_ENABLED          0x01
>   #define DIRTY_BITMAP_MIG_START_FLAG_PERSISTENT       0x02
> -/* 0x04 was "AUTOLOAD" flags on elder versions, no it is ignored */
> +/* 0x04 was "AUTOLOAD" flags on older versions, now it is ignored */

may be also s/flags/flag

>   #define DIRTY_BITMAP_MIG_START_FLAG_RESERVED_MASK    0xf8
> 
>   /* State of one bitmap during save process */
> @@ -180,7 +180,7 @@ static uint32_t qemu_get_bitmap_flags(QEMUFile *f)
> 
>   static void qemu_put_bitmap_flags(QEMUFile *f, uint32_t flags)
>   {
> -    /* The code currently do not send flags more than one byte */
> +    /* The code currently does not send flags as more than one byte */

Hmm, why "as more than", not just "more than"?.
(this note is about the following: the protocol allows adding more than
one byte of flags with use of DIRTY_BITMAP_MIG_EXTRA_FLAGS. Still,
currently this possibility is not used and we assert it.)

>       assert(!(flags & (0xffffff00 | DIRTY_BITMAP_MIG_EXTRA_FLAGS)));
> 
>       qemu_put_byte(f, flags);
> 

Anyway:
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

-- 
Best regards,
Vladimir