diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-13 13:40:23 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-13 13:40:23 +0000 |
| commit | 5ececc3a0b0086c6168e12f4d032809477b30fe5 (patch) | |
| tree | 6c898f1e442e1cc360cef48a9f93b8026931ac5f /include/monitor/hmp-target.h | |
| parent | 6980c128b5cbc1d2a1b85609bb4d1e006e65109e (diff) | |
| parent | e7cff9c68d4a46343861fbc3cc6b2a0b63b2dbb8 (diff) | |
| download | focaccia-qemu-5ececc3a0b0086c6168e12f4d032809477b30fe5.tar.gz focaccia-qemu-5ececc3a0b0086c6168e12f4d032809477b30fe5.zip | |
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>
Diffstat (limited to 'include/monitor/hmp-target.h')
| -rw-r--r-- | include/monitor/hmp-target.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h index 8b7820a3ad..60fc92722a 100644 --- a/include/monitor/hmp-target.h +++ b/include/monitor/hmp-target.h @@ -33,15 +33,16 @@ struct MonitorDef { const char *name; int offset; - target_long (*get_value)(const struct MonitorDef *md, int val); + target_long (*get_value)(Monitor *mon, const struct MonitorDef *md, + int val); int type; }; const MonitorDef *target_monitor_defs(void); int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); -CPUArchState *mon_get_cpu_env(void); -CPUState *mon_get_cpu(void); +CPUArchState *mon_get_cpu_env(Monitor *mon); +CPUState *mon_get_cpu(Monitor *mon); void hmp_info_mem(Monitor *mon, const QDict *qdict); void hmp_info_tlb(Monitor *mon, const QDict *qdict); |