Message ID | 1602508140-11372-3-git-send-email-yubihong@huawei.com |
---|---|
State | Superseded |
Headers | show |
Series | Fix some style problems in migration | expand |
* Bihong Yu (yubihong@huawei.com) wrote: > Signed-off-by: Bihong Yu <yubihong@huawei.com> > Reviewed-by: Chuan Zheng <zhengchuan@huawei.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/block.c | 2 +- > migration/ram.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/migration/block.c b/migration/block.c > index 4b8576b..273392b 100644 > --- a/migration/block.c > +++ b/migration/block.c > @@ -998,7 +998,7 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) > (addr == 100) ? '\n' : '\r'); > fflush(stdout); > } else if (!(flags & BLK_MIG_FLAG_EOS)) { > - fprintf(stderr, "Unknown block migration flags: %#x\n", flags); > + fprintf(stderr, "Unknown block migration flags: 0x%x\n", flags); > return -EINVAL; > } > ret = qemu_file_get_error(f); > diff --git a/migration/ram.c b/migration/ram.c > index 433489d..6ed4f9e 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -3298,7 +3298,7 @@ static int ram_load_postcopy(QEMUFile *f) > multifd_recv_sync_main(); > break; > default: > - error_report("Unknown combination of migration flags: %#x" > + error_report("Unknown combination of migration flags: 0x%x" > " (postcopy mode)", flags); > ret = -EINVAL; > break; > @@ -3576,7 +3576,7 @@ static int ram_load_precopy(QEMUFile *f) > if (flags & RAM_SAVE_FLAG_HOOK) { > ram_control_load_hook(f, RAM_CONTROL_HOOK, NULL); > } else { > - error_report("Unknown combination of migration flags: %#x", > + error_report("Unknown combination of migration flags: 0x%x", > flags); > ret = -EINVAL; > } > -- > 1.8.3.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
On 10/12/20 3:08 PM, Bihong Yu wrote: > Signed-off-by: Bihong Yu <yubihong@huawei.com> > Reviewed-by: Chuan Zheng <zhengchuan@huawei.com> > --- > migration/block.c | 2 +- > migration/ram.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/migration/block.c b/migration/block.c index 4b8576b..273392b 100644 --- a/migration/block.c +++ b/migration/block.c @@ -998,7 +998,7 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) (addr == 100) ? '\n' : '\r'); fflush(stdout); } else if (!(flags & BLK_MIG_FLAG_EOS)) { - fprintf(stderr, "Unknown block migration flags: %#x\n", flags); + fprintf(stderr, "Unknown block migration flags: 0x%x\n", flags); return -EINVAL; } ret = qemu_file_get_error(f); diff --git a/migration/ram.c b/migration/ram.c index 433489d..6ed4f9e 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3298,7 +3298,7 @@ static int ram_load_postcopy(QEMUFile *f) multifd_recv_sync_main(); break; default: - error_report("Unknown combination of migration flags: %#x" + error_report("Unknown combination of migration flags: 0x%x" " (postcopy mode)", flags); ret = -EINVAL; break; @@ -3576,7 +3576,7 @@ static int ram_load_precopy(QEMUFile *f) if (flags & RAM_SAVE_FLAG_HOOK) { ram_control_load_hook(f, RAM_CONTROL_HOOK, NULL); } else { - error_report("Unknown combination of migration flags: %#x", + error_report("Unknown combination of migration flags: 0x%x", flags); ret = -EINVAL; }