1. Patchew
  2. QEMU
  3. [PATCH-for-5.2 0/4] misc: Trivial format string fixes
  4. View patch

[PATCH-for-5.2 4/4] migration/ram: Fix hexadecimal format string specifier

Philippe Mathieu-Daudé posted 4 patches 5 years, 3 months ago
[PATCH-for-5.2 4/4] migration/ram: Fix hexadecimal format string specifier
Posted by Philippe Mathieu-Daudé 5 years, 3 months ago 
The '%u' conversion specifier is for decimal notation.
When prefixing a format with '0x', we want the hexadecimal
specifier ('%x').

Inspired-by: Dov Murik <dovmurik@linux.vnet.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 migration/ram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/ram.c b/migration/ram.c
index 2da2b622ab2..23dcfb3ac38 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3729,7 +3729,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block)
     }
 
     if (end_mark != RAMBLOCK_RECV_BITMAP_ENDING) {
-        error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIu64,
+        error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIx64,
                      __func__, block->idstr, end_mark);
         ret = -EINVAL;
         goto out;
-- 
2.26.2
Re: [PATCH-for-5.2 4/4] migration/ram: Fix hexadecimal format string specifier
Posted by Dr. David Alan Gilbert 5 years, 3 months ago 
* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> The '%u' conversion specifier is for decimal notation.
> When prefixing a format with '0x', we want the hexadecimal
> specifier ('%x').
> 
> Inspired-by: Dov Murik <dovmurik@linux.vnet.ibm.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  migration/ram.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/migration/ram.c b/migration/ram.c
> index 2da2b622ab2..23dcfb3ac38 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -3729,7 +3729,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block)
>      }
>  
>      if (end_mark != RAMBLOCK_RECV_BITMAP_ENDING) {
> -        error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIu64,
> +        error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIx64,
>                       __func__, block->idstr, end_mark);
>          ret = -EINVAL;
>          goto out;
> -- 
> 2.26.2
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Re: [PATCH-for-5.2 4/4] migration/ram: Fix hexadecimal format string specifier
Posted by Philippe Mathieu-Daudé 5 years, 3 months ago 
Hi David, Juan.

On 11/3/20 1:46 PM, Dr. David Alan Gilbert wrote:
> * Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
>> The '%u' conversion specifier is for decimal notation.
>> When prefixing a format with '0x', we want the hexadecimal
>> specifier ('%x').
>>
>> Inspired-by: Dov Murik <dovmurik@linux.vnet.ibm.com>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> 
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

As there is no qemu-trivial@ pull request during freeze/rc,
can you queue this patch via your migration tree?

Thanks,

Phil.

> 
>> ---
>>  migration/ram.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/migration/ram.c b/migration/ram.c
>> index 2da2b622ab2..23dcfb3ac38 100644
>> --- a/migration/ram.c
>> +++ b/migration/ram.c
>> @@ -3729,7 +3729,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block)
>>      }
>>  
>>      if (end_mark != RAMBLOCK_RECV_BITMAP_ENDING) {
>> -        error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIu64,
>> +        error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIx64,
>>                       __func__, block->idstr, end_mark);
>>          ret = -EINVAL;
>>          goto out;
>> -- 
>> 2.26.2
>>
Re: [PATCH-for-5.2 4/4] migration/ram: Fix hexadecimal format string specifier
Posted by Dr. David Alan Gilbert 5 years, 3 months ago 
* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> Hi David, Juan.
> 
> On 11/3/20 1:46 PM, Dr. David Alan Gilbert wrote:
> > * Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> >> The '%u' conversion specifier is for decimal notation.
> >> When prefixing a format with '0x', we want the hexadecimal
> >> specifier ('%x').
> >>
> >> Inspired-by: Dov Murik <dovmurik@linux.vnet.ibm.com>
> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > 
> > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> 
> As there is no qemu-trivial@ pull request during freeze/rc,
> can you queue this patch via your migration tree?

Yep, will do.

Dave

> Thanks,
> 
> Phil.
> 
> > 
> >> ---
> >>  migration/ram.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/migration/ram.c b/migration/ram.c
> >> index 2da2b622ab2..23dcfb3ac38 100644
> >> --- a/migration/ram.c
> >> +++ b/migration/ram.c
> >> @@ -3729,7 +3729,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block)
> >>      }
> >>  
> >>      if (end_mark != RAMBLOCK_RECV_BITMAP_ENDING) {
> >> -        error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIu64,
> >> +        error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIx64,
> >>                       __func__, block->idstr, end_mark);
> >>          ret = -EINVAL;
> >>          goto out;
> >> -- 
> >> 2.26.2
> >>
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Re: [PATCH-for-5.2 4/4] migration/ram: Fix hexadecimal format string specifier
Posted by Dr. David Alan Gilbert 5 years, 2 months ago 
* Dr. David Alan Gilbert (dgilbert@redhat.com) wrote:
> * Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> > Hi David, Juan.
> > 
> > On 11/3/20 1:46 PM, Dr. David Alan Gilbert wrote:
> > > * Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> > >> The '%u' conversion specifier is for decimal notation.
> > >> When prefixing a format with '0x', we want the hexadecimal
> > >> specifier ('%x').
> > >>
> > >> Inspired-by: Dov Murik <dovmurik@linux.vnet.ibm.com>
> > >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > > 
> > > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> > 
> > As there is no qemu-trivial@ pull request during freeze/rc,
> > can you queue this patch via your migration tree?
> 
> Yep, will do.

Queued

> Dave
> 
> > Thanks,
> > 
> > Phil.
> > 
> > > 
> > >> ---
> > >>  migration/ram.c | 2 +-
> > >>  1 file changed, 1 insertion(+), 1 deletion(-)
> > >>
> > >> diff --git a/migration/ram.c b/migration/ram.c
> > >> index 2da2b622ab2..23dcfb3ac38 100644
> > >> --- a/migration/ram.c
> > >> +++ b/migration/ram.c
> > >> @@ -3729,7 +3729,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block)
> > >>      }
> > >>  
> > >>      if (end_mark != RAMBLOCK_RECV_BITMAP_ENDING) {
> > >> -        error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIu64,
> > >> +        error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIx64,
> > >>                       __func__, block->idstr, end_mark);
> > >>          ret = -EINVAL;
> > >>          goto out;
> > >> -- 
> > >> 2.26.2
> > >>
> > 
> -- 
> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
> 
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.