[Qemu-commits] [qemu/qemu] 2fc5d0: hmp: Pass monitor to mon_get_cpu()

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 2fc5d01bb43049851a95c8a66df7ee33e3489b54
      
https://github.com/qemu/qemu/commit/2fc5d01bb43049851a95c8a66df7ee33e3489b54
  Author: Kevin Wolf <kwolf@redhat.com>
  Date:   2020-11-13 (Fri, 13 Nov 2020)

  Changed paths:
    M include/monitor/hmp-target.h
    M monitor/hmp.c
    M monitor/misc.c
    M monitor/monitor-internal.h
    M target/i386/monitor.c

  Log Message:
  -----------
  hmp: Pass monitor to mon_get_cpu()

mon_get_cpu() is indirectly called monitor_parse_arguments() where
the current monitor isn't set yet. Instead of using monitor_cur(),
explicitly pass the Monitor pointer to the function.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201113114326.97663-2-kwolf@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: 43cf067ff8b17b23e3dd0ba8e0214c55a140f700
      
https://github.com/qemu/qemu/commit/43cf067ff8b17b23e3dd0ba8e0214c55a140f700
  Author: Kevin Wolf <kwolf@redhat.com>
  Date:   2020-11-13 (Fri, 13 Nov 2020)

  Changed paths:
    M include/monitor/hmp-target.h
    M monitor/misc.c
    M target/i386/monitor.c
    M target/ppc/monitor.c
    M target/sparc/monitor.c

  Log Message:
  -----------
  hmp: Pass monitor to MonitorDef.get_value()

All of these callbacks use mon_get_cpu_env(). Pass the Monitor
pointer to them it in preparation for adding a monitor argument to
mon_get_cpu_env().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201113114326.97663-3-kwolf@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: e7cff9c68d4a46343861fbc3cc6b2a0b63b2dbb8
      
https://github.com/qemu/qemu/commit/e7cff9c68d4a46343861fbc3cc6b2a0b63b2dbb8
  Author: Kevin Wolf <kwolf@redhat.com>
  Date:   2020-11-13 (Fri, 13 Nov 2020)

  Changed paths:
    M include/monitor/hmp-target.h
    M monitor/misc.c
    M target/i386/monitor.c
    M target/m68k/monitor.c
    M target/nios2/monitor.c
    M target/ppc/monitor.c
    M target/riscv/monitor.c
    M target/sh4/monitor.c
    M target/sparc/monitor.c
    M target/xtensa/monitor.c

  Log Message:
  -----------
  hmp: Pass monitor to mon_get_cpu_env()

mon_get_cpu_env() is indirectly called monitor_parse_arguments() where
the current monitor isn't set yet. Instead of using monitor_cur_env(),
explicitly pass the Monitor pointer to the function.

Without this fix, an HMP command like "x $pc" crashes like this:

  #0  0x0000555555caa01f in mon_get_cpu_sync (mon=0x0, synchronize=true) at 
../monitor/misc.c:270
  #1  0x0000555555caa141 in mon_get_cpu (mon=0x0) at ../monitor/misc.c:294
  #2  0x0000555555caa158 in mon_get_cpu_env () at ../monitor/misc.c:299
  #3  0x0000555555b19739 in monitor_get_pc (mon=0x555556ad2de0, 
md=0x5555565d2d40 <monitor_defs+1152>, val=0) at ../target/i386/monitor.c:607
  #4  0x0000555555cadbec in get_monitor_def (mon=0x555556ad2de0, 
pval=0x7fffffffc208, name=0x7fffffffc220 "pc") at ../monitor/misc.c:1681
  #5  0x000055555582ec4f in expr_unary (mon=0x555556ad2de0) at 
../monitor/hmp.c:387
  #6  0x000055555582edbb in expr_prod (mon=0x555556ad2de0) at 
../monitor/hmp.c:421
  #7  0x000055555582ee79 in expr_logic (mon=0x555556ad2de0) at 
../monitor/hmp.c:455
  #8  0x000055555582eefe in expr_sum (mon=0x555556ad2de0) at 
../monitor/hmp.c:484
  #9  0x000055555582efe8 in get_expr (mon=0x555556ad2de0, pval=0x7fffffffc418, 
pp=0x7fffffffc408) at ../monitor/hmp.c:511
  #10 0x000055555582fcd4 in monitor_parse_arguments (mon=0x555556ad2de0, 
endp=0x7fffffffc890, cmd=0x555556675b50 <hmp_cmds+7920>) at ../monitor/hmp.c:876
  #11 0x00005555558306a8 in handle_hmp_command (mon=0x555556ad2de0, 
cmdline=0x555556ada452 "$pc") at ../monitor/hmp.c:1087
  #12 0x000055555582df14 in monitor_command_cb (opaque=0x555556ad2de0, 
cmdline=0x555556ada450 "x $pc", readline_opaque=0x0) at ../monitor/hmp.c:47

After this fix, nothing is left in monitor_parse_arguments() that can
indirectly call monitor_cur(), so the fix is complete.

Fixes: ff04108a0e36e822519c517bd3bddbc1c7747c18
Reported-by: lichun <lichun@ruijie.com.cn>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201113114326.97663-4-kwolf@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: 5ececc3a0b0086c6168e12f4d032809477b30fe5
      
https://github.com/qemu/qemu/commit/5ececc3a0b0086c6168e12f4d032809477b30fe5
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-11-13 (Fri, 13 Nov 2020)

  Changed paths:
    M include/monitor/hmp-target.h
    M monitor/hmp.c
    M monitor/misc.c
    M monitor/monitor-internal.h
    M target/i386/monitor.c
    M target/m68k/monitor.c
    M target/nios2/monitor.c
    M target/ppc/monitor.c
    M target/riscv/monitor.c
    M target/sh4/monitor.c
    M target/sparc/monitor.c
    M target/xtensa/monitor.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20201113' into 
staging

HMP fixes

Kevin's HMP fixes

# gpg: Signature made Fri 13 Nov 2020 13:04:36 GMT
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" 
[full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-hmp-20201113:
  hmp: Pass monitor to mon_get_cpu_env()
  hmp: Pass monitor to MonitorDef.get_value()
  hmp: Pass monitor to mon_get_cpu()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/6980c128b5cb...5ececc3a0b00