Commit 37560c25 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f75d1523 574d9693

hmp-commands.hx

+15 −0
Original line number Diff line number Diff line
@@ -585,6 +585,21 @@ STEXI 
@findex gpa2hpa

Print the host physical address at which the guest's physical address @var{addr}

is mapped.

ETEXI



    {

        .name       = "gva2gpa",

        .args_type  = "addr:l",

        .params     = "addr",

        .help       = "print the guest physical address corresponding to a guest virtual address",

        .cmd        = hmp_gva2gpa,

    },



STEXI

@item gva2gpa @var{addr}

@findex gva2gpa

Print the guest physical address at which the guest's virtual address @var{addr}

is mapped based on the mapping for the current CPU.

ETEXI



    {

hmp.c

+4 −3
Original line number Diff line number Diff line
@@ -1480,10 +1480,11 @@ void hmp_delvm(Monitor *mon, const QDict *qdict) 
    const char *name = qdict_get_str(qdict, "name");



    if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) {

        error_reportf_err(err,

                          "Error while deleting snapshot on device '%s': ",

        error_prepend(&err,

                      "deleting snapshot on device '%s': ",

                      bdrv_get_device_name(bs));

    }

    hmp_handle_error(mon, &err);

}



void hmp_info_snapshots(Monitor *mon, const QDict *qdict)

monitor.c

+22 −0
Original line number Diff line number Diff line
@@ -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)

{

tests/test-hmp.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static const char *hmp_cmds[] = { 
    "dump-guest-memory /dev/null 0 4096",

    "dump-guest-memory /dev/null",

    "gdbserver",

    "gva2gpa 0",

    "hostfwd_add tcp::43210-:43210",

    "hostfwd_remove tcp::43210-:43210",

    "i /w 0",