| Message ID | 1602508140-11372-1-git-send-email-yubihong@huawei.com |
|---|---|
| Headers | show |
| Series | Fix some style problems in migration | expand |
OK, I will modify it later. On 2020/10/14 9:29, Zheng Chuan wrote: > Also DEBUG_CACHE in migration/page_cache.c is need to rebase on trace_calls. > > On 2020/10/13 21:20, Bihong Yu wrote: >> Thank you for your review. OK, I will try to rewrite the DPRINTF to use trace_ instead. >> >> On 2020/10/13 17:39, Dr. David Alan Gilbert wrote: >>> * 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> >>> >>> another task at some point would be to rewrite the DPRINTF's in >>> migration/block.c to use trace_ instead. >>> >>>> --- >>>> migration/block.c | 2 +- >>>> migration/rdma.c | 2 +- >>>> 2 files changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/migration/block.c b/migration/block.c >>>> index 737b649..4b8576b 100644 >>>> --- a/migration/block.c >>>> +++ b/migration/block.c >>>> @@ -40,7 +40,7 @@ >>>> #define MAX_IO_BUFFERS 512 >>>> #define MAX_PARALLEL_IO 16 >>>> >>>> -//#define DEBUG_BLK_MIGRATION >>>> +/* #define DEBUG_BLK_MIGRATION */ >>>> >>>> #ifdef DEBUG_BLK_MIGRATION >>>> #define DPRINTF(fmt, ...) \ >>>> diff --git a/migration/rdma.c b/migration/rdma.c >>>> index 0340841..0eb42b7 100644 >>>> --- a/migration/rdma.c >>>> +++ b/migration/rdma.c >>>> @@ -1288,7 +1288,7 @@ const char *print_wrid(int wrid) >>>> * workload information or LRU information is available, do not attempt to use >>>> * this feature except for basic testing. >>>> */ >>>> -//#define RDMA_UNREGISTRATION_EXAMPLE >>>> +/* #define RDMA_UNREGISTRATION_EXAMPLE */ >>>> >>>> /* >>>> * Perform a non-optimized memory unregistration after every transfer >>>> -- >>>> 1.8.3.1 >>>> >> . >> >
* Bihong Yu (yubihong@huawei.com) wrote: > Signed-off-by: Bihong Yu <yubihong@huawei.com> > Reviewed-by: Chuan Zheng <zhengchuan@huawei.com> OK, sometimes I find initialisation clearer Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/ram.c | 2 +- > migration/savevm.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index 09178cc..2da2b62 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -2743,7 +2743,7 @@ static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host) > */ > static inline RAMBlock *ram_block_from_stream(QEMUFile *f, int flags) > { > - static RAMBlock *block = NULL; > + static RAMBlock *block; > char id[256]; > uint8_t len; > > diff --git a/migration/savevm.c b/migration/savevm.c > index 9e95df1..f808bc2 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -64,7 +64,7 @@ > #include "qemu/bitmap.h" > #include "net/announce.h" > > -const unsigned int postcopy_ram_discard_version = 0; > +const unsigned int postcopy_ram_discard_version; > > /* Subcommands for QEMU_VM_COMMAND */ > enum qemu_vm_cmd { > -- > 1.8.3.1 >
On 10/14/20 9:21 PM, Dr. David Alan Gilbert wrote: > * Bihong Yu (yubihong@huawei.com) wrote: >> Signed-off-by: Bihong Yu <yubihong@huawei.com> >> Reviewed-by: Chuan Zheng <zhengchuan@huawei.com> > > OK, sometimes I find initialisation clearer > > > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > >> --- >> migration/ram.c | 2 +- >> migration/savevm.c | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/migration/ram.c b/migration/ram.c >> index 09178cc..2da2b62 100644 >> --- a/migration/ram.c >> +++ b/migration/ram.c >> @@ -2743,7 +2743,7 @@ static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host) >> */ >> static inline RAMBlock *ram_block_from_stream(QEMUFile *f, int flags) >> { >> - static RAMBlock *block = NULL; >> + static RAMBlock *block; OK. >> char id[256]; >> uint8_t len; >> >> diff --git a/migration/savevm.c b/migration/savevm.c >> index 9e95df1..f808bc2 100644 >> --- a/migration/savevm.c >> +++ b/migration/savevm.c >> @@ -64,7 +64,7 @@ >> #include "qemu/bitmap.h" >> #include "net/announce.h" >> >> -const unsigned int postcopy_ram_discard_version = 0; >> +const unsigned int postcopy_ram_discard_version; I agree with Dave, this one is clearer initialized. >> >> /* Subcommands for QEMU_VM_COMMAND */ >> enum qemu_vm_cmd { >> -- >> 1.8.3.1 >>
On 10/12/20 3:09 PM, Bihong Yu wrote: > Signed-off-by: Bihong Yu <yubihong@huawei.com> > Reviewed-by: Chuan Zheng <zhengchuan@huawei.com> > --- > migration/rdma.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Recently I am reading migration related code, find some style problems in migration directory while using checkpatch.pl to check migration code. Fix the error style problems. v2: - fix Signed-off-by error - fix printf format error: "%0x" -> "0x%x" Bihong Yu (8): migration: Do not use C99 // comments migration: Don't use '#' flag of printf format migration: Add spaces around operator migration: Open brace '{' following struct go on the same line migration: Add braces {} for if statement migration: Do not initialise statics and globals to 0 or NULL migration: Open brace '{' following function declarations go on the next line migration: Delete redundant spaces migration/block.c | 4 ++-- migration/migration.c | 4 ++-- migration/migration.h | 3 +-- migration/postcopy-ram.c | 2 +- migration/ram.c | 14 ++++++++------ migration/rdma.c | 7 ++++--- migration/savevm.c | 4 ++-- migration/vmstate.c | 10 +++++----- 8 files changed, 25 insertions(+), 23 deletions(-)