diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-02 11:21:02 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-02 11:21:02 +0100 |
| commit | 37560c259d7a0d6aceb96e9d6903ee002f4e5e0c (patch) | |
| tree | ec4a2ca2ebff19f5620c50a147d972562928866e /monitor.c | |
| parent | f75d15231e56cb0f2bafe19faf1229c459a60731 (diff) | |
| parent | 574d96933ceff60b2d13fe97602572fc7e95f7c6 (diff) | |
| download | focaccia-qemu-37560c259d7a0d6aceb96e9d6903ee002f4e5e0c.tar.gz focaccia-qemu-37560c259d7a0d6aceb96e9d6903ee002f4e5e0c.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20190501' into staging
HMP pull New gva2gpa command delvm now uses hmp_handle_error so gets Error: prefix in messages # gpg: Signature made Wed 01 May 2019 11:57:43 BST # 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-20190501: hmp: gva2gpa debug command hmp: delvm: use hmp_handle_error Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/monitor.c b/monitor.c index 9b5f10b475..bb48997913 100644 --- a/monitor.c +++ b/monitor.c @@ -1673,6 +1673,28 @@ static void hmp_gpa2hva(Monitor *mon, const QDict *qdict) memory_region_unref(mr); } +static void hmp_gva2gpa(Monitor *mon, const QDict *qdict) +{ + target_ulong addr = qdict_get_int(qdict, "addr"); + MemTxAttrs attrs; + CPUState *cs = mon_get_cpu(); + hwaddr gpa; + + if (!cs) { + monitor_printf(mon, "No cpu\n"); + return; + } + + gpa = cpu_get_phys_page_attrs_debug(mon_get_cpu(), + addr & TARGET_PAGE_MASK, &attrs); + if (gpa == -1) { + monitor_printf(mon, "Unmapped\n"); + } else { + monitor_printf(mon, "gpa: %#" HWADDR_PRIx "\n", + gpa + (addr & ~TARGET_PAGE_MASK)); + } +} + #ifdef CONFIG_LINUX static uint64_t vtop(void *ptr, Error **errp) { |