| Message ID | 20211224065000.97572-7-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | migration: Postcopy cleanup on ram disgard | expand |
On Friday, 2021-12-24 at 14:49:58 +08, Peter Xu wrote: > It'll be easier to read the name rather than index of sub-cmd when debugging. > > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: David Edmondson <david.edmondson@oracle.com> > --- > migration/savevm.c | 3 ++- > migration/trace-events | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/migration/savevm.c b/migration/savevm.c > index 0bef031acb..7f7af6f750 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -2272,12 +2272,13 @@ static int loadvm_process_command(QEMUFile *f) > return qemu_file_get_error(f); > } > > - trace_loadvm_process_command(cmd, len); > if (cmd >= MIG_CMD_MAX || cmd == MIG_CMD_INVALID) { > error_report("MIG_CMD 0x%x unknown (len 0x%x)", cmd, len); > return -EINVAL; > } > > + trace_loadvm_process_command(mig_cmd_args[cmd].name, len); > + > if (mig_cmd_args[cmd].len != -1 && mig_cmd_args[cmd].len != len) { > error_report("%s received with bad length - expecting %zu, got %d", > mig_cmd_args[cmd].name, > diff --git a/migration/trace-events b/migration/trace-events > index b48d873b8a..d63a5915f5 100644 > --- a/migration/trace-events > +++ b/migration/trace-events > @@ -22,7 +22,7 @@ loadvm_postcopy_handle_resume(void) "" > loadvm_postcopy_ram_handle_discard(void) "" > loadvm_postcopy_ram_handle_discard_end(void) "" > loadvm_postcopy_ram_handle_discard_header(const char *ramid, uint16_t len) "%s: %ud" > -loadvm_process_command(uint16_t com, uint16_t len) "com=0x%x len=%d" > +loadvm_process_command(const char *s, uint16_t len) "com=%s len=%d" > loadvm_process_command_ping(uint32_t val) "0x%x" > postcopy_ram_listen_thread_exit(void) "" > postcopy_ram_listen_thread_start(void) "" dme.
On 12/24/21 07:49, Peter Xu wrote: > It'll be easier to read the name rather than index of sub-cmd when debugging. > > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > migration/savevm.c | 3 ++- > migration/trace-events | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > diff --git a/migration/trace-events b/migration/trace-events > index b48d873b8a..d63a5915f5 100644 > --- a/migration/trace-events > +++ b/migration/trace-events > @@ -22,7 +22,7 @@ loadvm_postcopy_handle_resume(void) "" > loadvm_postcopy_ram_handle_discard(void) "" > loadvm_postcopy_ram_handle_discard_end(void) "" > loadvm_postcopy_ram_handle_discard_header(const char *ramid, uint16_t len) "%s: %ud" > -loadvm_process_command(uint16_t com, uint16_t len) "com=0x%x len=%d" > +loadvm_process_command(const char *s, uint16_t len) "com=%s len=%d" Also: len=%u Otherwise: Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/migration/savevm.c b/migration/savevm.c index 0bef031acb..7f7af6f750 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2272,12 +2272,13 @@ static int loadvm_process_command(QEMUFile *f) return qemu_file_get_error(f); } - trace_loadvm_process_command(cmd, len); if (cmd >= MIG_CMD_MAX || cmd == MIG_CMD_INVALID) { error_report("MIG_CMD 0x%x unknown (len 0x%x)", cmd, len); return -EINVAL; } + trace_loadvm_process_command(mig_cmd_args[cmd].name, len); + if (mig_cmd_args[cmd].len != -1 && mig_cmd_args[cmd].len != len) { error_report("%s received with bad length - expecting %zu, got %d", mig_cmd_args[cmd].name, diff --git a/migration/trace-events b/migration/trace-events index b48d873b8a..d63a5915f5 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -22,7 +22,7 @@ loadvm_postcopy_handle_resume(void) "" loadvm_postcopy_ram_handle_discard(void) "" loadvm_postcopy_ram_handle_discard_end(void) "" loadvm_postcopy_ram_handle_discard_header(const char *ramid, uint16_t len) "%s: %ud" -loadvm_process_command(uint16_t com, uint16_t len) "com=0x%x len=%d" +loadvm_process_command(const char *s, uint16_t len) "com=%s len=%d" loadvm_process_command_ping(uint32_t val) "0x%x" postcopy_ram_listen_thread_exit(void) "" postcopy_ram_listen_thread_start(void) ""
It'll be easier to read the name rather than index of sub-cmd when debugging. Signed-off-by: Peter Xu <peterx@redhat.com> --- migration/savevm.c | 3 ++- migration/trace-events | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)