Commit 29b18b7a authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'stefanha/trivial-patches' into staging 

* stefanha/trivial-patches:
  trace-events: Fix broken build caused by wrong format specifier
  test: add test-qmp-commands to make check
  qapi: remove print statements from test-qmp-commands
  test: remove qemu-ga reference
  vl.c: fix '-cpu ?' segfault
parents 3d032f0f 95b752bc

test-qmp-commands.c

+0 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ static void test_dispatch_cmd(void) 
    resp = qmp_dispatch(QOBJECT(req));

    assert(resp != NULL);

    assert(!qdict_haskey(qobject_to_qdict(resp), "error"));

    g_print("\nresp: %s\n", qstring_get_str(qobject_to_json(resp)));



    qobject_decref(resp);

    QDECREF(req);
@@ -63,7 +62,6 @@ static void test_dispatch_cmd_error(void) 
    resp = qmp_dispatch(QOBJECT(req));

    assert(resp != NULL);

    assert(qdict_haskey(qobject_to_qdict(resp), "error"));

    g_print("\nresp: %s\n", qstring_get_str(qobject_to_json_pretty(resp)));



    qobject_decref(resp);

    QDECREF(req);
@@ -92,7 +90,6 @@ static void test_dispatch_cmd_io(void) 
    resp = qmp_dispatch(QOBJECT(req));

    assert(resp != NULL);

    assert(!qdict_haskey(qobject_to_qdict(resp), "error"));

    g_print("\nresp: %s\n", qstring_get_str(qobject_to_json_pretty(resp)));



    qobject_decref(resp);

    QDECREF(req);

tests/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ export SRC_PATH 
CHECKS = check-qdict check-qfloat check-qint check-qstring check-qlist

CHECKS += check-qjson test-qmp-output-visitor test-qmp-input-visitor

CHECKS += test-string-input-visitor test-string-output-visitor test-coroutine

CHECKS += test-qmp-commands

CHECKS += $(SRC_PATH)/tests/qemu-iotests-quick.sh



check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o test-coroutine.o: $(GENERATED_HEADERS)

trace-events

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ ppm_save(const char *filename, void *display_surface) "%s surface=%p" 
# hw/qxl.c

disable qxl_interface_set_mm_time(int qid, uint32_t mm_time) "%d %d"

disable qxl_io_write_vga(int qid, const char *mode, uint32_t addr, uint32_t val) "%d %s addr=%u val=%u"

qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %dx%d mem=%lx %d,%d"

qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %ux%u mem=%" PRIx64 " %u,%u"

qxl_create_guest_primary_rest(int qid, int32_t stride, uint32_t type, uint32_t flags) "%d %d,%d,%d"

qxl_destroy_primary(int qid) "%d"

qxl_enter_vga_mode(int qid) "%d"

vl.c

+1 −1
Original line number Diff line number Diff line
@@ -3196,7 +3196,7 @@ int main(int argc, char **argv, char **envp) 
    cpudef_init();



    if (cpu_model && *cpu_model == '?') {

        list_cpus(stdout, &fprintf, optarg);

        list_cpus(stdout, &fprintf, cpu_model);

        exit(0);

    }