Commit 41c7c7ef authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20170426' into staging 



HMP pull, with tcg fix

# gpg: Signature made Wed 26 Apr 2017 14:55:30 BST
# gpg:                using RSA key 0x0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-hmp-20170426:
  tests: Add a tester for HMP commands
  libqtest: Add a generic function to run a callback function for every machine
  libqtest: Ignore QMP events when parsing the response for HMP commands
  monitor: Check whether TCG is enabled before running the "info jit" code
  hmp: gpa2hva and gpa2hpa hostaddr command

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents dcaed66c 78f86a2b

hmp-commands.hx

+32 −0
Original line number Diff line number Diff line
@@ -523,6 +523,38 @@ Dump 80 16 bit values at the start of the video memory. 
0x000b8090: 0x0720 0x0720 0x0720 0x0720 0x0720 0x0720 0x0720 0x0720

@end smallexample

@end itemize

ETEXI



    {

        .name       = "gpa2hva",

        .args_type  = "addr:l",

        .params     = "addr",

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

        .cmd        = hmp_gpa2hva,

    },



STEXI

@item gpa2hva @var{addr}

@findex gpa2hva

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

is mapped.

ETEXI



#ifdef CONFIG_LINUX

    {

        .name       = "gpa2hpa",

        .args_type  = "addr:l",

        .params     = "addr",

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

        .cmd        = hmp_gpa2hpa,

    },

#endif



STEXI

@item gpa2hpa @var{addr}

@findex gpa2hpa

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

is mapped.

ETEXI



    {

monitor.c

+106 −0
Original line number Diff line number Diff line
@@ -1086,6 +1086,11 @@ static void hmp_info_registers(Monitor *mon, const QDict *qdict) 


static void hmp_info_jit(Monitor *mon, const QDict *qdict)

{

    if (!tcg_enabled()) {

        error_report("JIT information is only available with accel=tcg");

        return;

    }



    dump_exec_info((FILE *)mon, monitor_fprintf);

    dump_drift_info((FILE *)mon, monitor_fprintf);

}
@@ -1421,6 +1426,107 @@ static void hmp_physical_memory_dump(Monitor *mon, const QDict *qdict) 
    memory_dump(mon, count, format, size, addr, 1);

}



static void *gpa2hva(MemoryRegion **p_mr, hwaddr addr, Error **errp)

{

    MemoryRegionSection mrs = memory_region_find(get_system_memory(),

                                                 addr, 1);



    if (!mrs.mr) {

        error_setg(errp, "No memory is mapped at address 0x%" HWADDR_PRIx, addr);

        return NULL;

    }



    if (!memory_region_is_ram(mrs.mr) && !memory_region_is_romd(mrs.mr)) {

        error_setg(errp, "Memory at address 0x%" HWADDR_PRIx "is not RAM", addr);

        memory_region_unref(mrs.mr);

        return NULL;

    }



    *p_mr = mrs.mr;

    return qemu_map_ram_ptr(mrs.mr->ram_block, mrs.offset_within_region);

}



static void hmp_gpa2hva(Monitor *mon, const QDict *qdict)

{

    hwaddr addr = qdict_get_int(qdict, "addr");

    Error *local_err = NULL;

    MemoryRegion *mr = NULL;

    void *ptr;



    ptr = gpa2hva(&mr, addr, &local_err);

    if (local_err) {

        error_report_err(local_err);

        return;

    }



    monitor_printf(mon, "Host virtual address for 0x%" HWADDR_PRIx

                   " (%s) is %p\n",

                   addr, mr->name, ptr);



    memory_region_unref(mr);

}



#ifdef CONFIG_LINUX

static uint64_t vtop(void *ptr, Error **errp)

{

    uint64_t pinfo;

    uint64_t ret = -1;

    uintptr_t addr = (uintptr_t) ptr;

    uintptr_t pagesize = getpagesize();

    off_t offset = addr / pagesize * sizeof(pinfo);

    int fd;



    fd = open("/proc/self/pagemap", O_RDONLY);

    if (fd == -1) {

        error_setg_errno(errp, errno, "Cannot open /proc/self/pagemap");

        return -1;

    }



    /* Force copy-on-write if necessary.  */

    atomic_add((uint8_t *)ptr, 0);



    if (pread(fd, &pinfo, sizeof(pinfo), offset) != sizeof(pinfo)) {

        error_setg_errno(errp, errno, "Cannot read pagemap");

        goto out;

    }

    if ((pinfo & (1ull << 63)) == 0) {

        error_setg(errp, "Page not present");

        goto out;

    }

    ret = ((pinfo & 0x007fffffffffffffull) * pagesize) | (addr & (pagesize - 1));



out:

    close(fd);

    return ret;

}



static void hmp_gpa2hpa(Monitor *mon, const QDict *qdict)

{

    hwaddr addr = qdict_get_int(qdict, "addr");

    Error *local_err = NULL;

    MemoryRegion *mr = NULL;

    void *ptr;

    uint64_t physaddr;



    ptr = gpa2hva(&mr, addr, &local_err);

    if (local_err) {

        error_report_err(local_err);

        return;

    }



    physaddr = vtop(ptr, &local_err);

    if (local_err) {

        error_report_err(local_err);

    } else {

        monitor_printf(mon, "Host physical address for 0x%" HWADDR_PRIx

                       " (%s) is 0x%" PRIx64 "\n",

                       addr, mr->name, (uint64_t) physaddr);

    }



    memory_region_unref(mr);

}

#endif



static void do_print(Monitor *mon, const QDict *qdict)

{

    int format = qdict_get_int(qdict, "format");

tests/Makefile.include

+2 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ check-qtest-xtensaeb-y = $(check-qtest-xtensa-y) 
check-qtest-s390x-y = tests/boot-serial-test$(EXESUF)



check-qtest-generic-y += tests/qom-test$(EXESUF)

check-qtest-generic-y += tests/test-hmp$(EXESUF)



qapi-schema += alternate-any.json

qapi-schema += alternate-array.json
@@ -720,6 +721,7 @@ tests/tpci200-test$(EXESUF): tests/tpci200-test.o 
tests/display-vga-test$(EXESUF): tests/display-vga-test.o

tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o

tests/qom-test$(EXESUF): tests/qom-test.o

tests/test-hmp$(EXESUF): tests/test-hmp.o

tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-pc-obj-y)

tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y)

tests/nvme-test$(EXESUF): tests/nvme-test.o

tests/libqtest.c

+36 −0
Original line number Diff line number Diff line
@@ -588,6 +588,12 @@ char *qtest_hmpv(QTestState *s, const char *fmt, va_list ap) 
                     " 'arguments': {'command-line': %s}}",

                     cmd);

    ret = g_strdup(qdict_get_try_str(resp, "return"));

    while (ret == NULL && qdict_get_try_str(resp, "event")) {

        /* Ignore asynchronous QMP events */

        QDECREF(resp);

        resp = qtest_qmp_receive(s);

        ret = g_strdup(qdict_get_try_str(resp, "return"));

    }

    g_assert(ret);

    QDECREF(resp);

    g_free(cmd);
@@ -940,3 +946,33 @@ bool qtest_big_endian(QTestState *s) 
{

    return s->big_endian;

}



void qtest_cb_for_every_machine(void (*cb)(const char *machine))

{

    QDict *response, *minfo;

    QList *list;

    const QListEntry *p;

    QObject *qobj;

    QString *qstr;

    const char *mname;



    qtest_start("-machine none");

    response = qmp("{ 'execute': 'query-machines' }");

    g_assert(response);

    list = qdict_get_qlist(response, "return");

    g_assert(list);



    for (p = qlist_first(list); p; p = qlist_next(p)) {

        minfo = qobject_to_qdict(qlist_entry_obj(p));

        g_assert(minfo);

        qobj = qdict_get(minfo, "name");

        g_assert(qobj);

        qstr = qobject_to_qstring(qobj);

        g_assert(qstr);

        mname = qstring_get_str(qstr);

        cb(mname);

    }



    qtest_end();

    QDECREF(response);

}

tests/libqtest.h

+11 −1
Original line number Diff line number Diff line
@@ -132,11 +132,12 @@ void qtest_qmp_eventwait(QTestState *s, const char *event); 
QDict *qtest_qmp_eventwait_ref(QTestState *s, const char *event);



/**

 * qtest_hmpv:

 * qtest_hmp:

 * @s: #QTestState instance to operate on.

 * @fmt...: HMP command to send to QEMU

 *

 * Send HMP command to QEMU via QMP's human-monitor-command.

 * QMP events are discarded.

 *

 * Returns: the command's output.  The caller should g_free() it.

 */
@@ -149,6 +150,7 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...); 
 * @ap: HMP command arguments

 *

 * Send HMP command to QEMU via QMP's human-monitor-command.

 * QMP events are discarded.

 *

 * Returns: the command's output.  The caller should g_free() it.

 */
@@ -917,4 +919,12 @@ void qmp_fd_send(int fd, const char *fmt, ...); 
QDict *qmp_fdv(int fd, const char *fmt, va_list ap);

QDict *qmp_fd(int fd, const char *fmt, ...);



/**

 * qtest_cb_for_every_machine:

 * @cb: Pointer to the callback function

 *

 *  Call a callback function for every name of all available machines.

 */

void qtest_cb_for_every_machine(void (*cb)(const char *machine));



#endif