| Message ID | 20211207115016.73195-7-peterx@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | migration: Postcopy cleanup on ram disgard | expand |
* Peter Xu (peterx@redhat.com) 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 | 2 +- > migration/trace-events | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/migration/savevm.c b/migration/savevm.c > index d59e976d50..17b8e25e00 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -2271,7 +2271,7 @@ static int loadvm_process_command(QEMUFile *f) > return qemu_file_get_error(f); > } > > - trace_loadvm_process_command(cmd, len); > + trace_loadvm_process_command(mig_cmd_args[cmd].name, len); > if (cmd >= MIG_CMD_MAX || cmd == MIG_CMD_INVALID) { No! you can't do that name lookup before the limit check. Dave > error_report("MIG_CMD 0x%x unknown (len 0x%x)", cmd, len); > return -EINVAL; > 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) "" > -- > 2.32.0 >
On Wed, Dec 08, 2021 at 06:41:22PM +0000, Dr. David Alan Gilbert wrote: > * Peter Xu (peterx@redhat.com) 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 | 2 +- > > migration/trace-events | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/migration/savevm.c b/migration/savevm.c > > index d59e976d50..17b8e25e00 100644 > > --- a/migration/savevm.c > > +++ b/migration/savevm.c > > @@ -2271,7 +2271,7 @@ static int loadvm_process_command(QEMUFile *f) > > return qemu_file_get_error(f); > > } > > > > - trace_loadvm_process_command(cmd, len); > > + trace_loadvm_process_command(mig_cmd_args[cmd].name, len); > > if (cmd >= MIG_CMD_MAX || cmd == MIG_CMD_INVALID) { > > No! you can't do that name lookup before the limit check. Heh, right. :) I guess it shouldn't matter in reality as we don't worry too much on untrusted or uncompatible src qemu, but it's very reasonable to fix it. Thanks!
diff --git a/migration/savevm.c b/migration/savevm.c index d59e976d50..17b8e25e00 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2271,7 +2271,7 @@ static int loadvm_process_command(QEMUFile *f) return qemu_file_get_error(f); } - trace_loadvm_process_command(cmd, len); + trace_loadvm_process_command(mig_cmd_args[cmd].name, len); if (cmd >= MIG_CMD_MAX || cmd == MIG_CMD_INVALID) { error_report("MIG_CMD 0x%x unknown (len 0x%x)", cmd, len); return -EINVAL; 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 | 2 +- migration/trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)