| Message ID | 20201103112558.2554390-5-philmd@redhat.com |
|---|---|
| State | Accepted |
| Commit | af3bbbe98405fe2d274696abe5def679a3b0c673 |
| Headers | show |
| Series | misc: Trivial format string fixes | expand |
* 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
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 >>
* 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
* 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
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;
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(-)