ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qtest: rename qtest_qmp_receive to qtest_qmp_receive_dict 

In the next patch a new version of qtest_qmp_receive will be
reintroduced that will buffer received qmp events for later
consumption in qtest_qmp_eventwait_ref

No functional change intended.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Maxim Levitsky 2020-10-06 14:38:52 +02:00 committed by Paolo Bonzini
parent fbc5884ce2
commit 1c3e2a38de
7 changed files with 24 additions and 24 deletions

4
tests/qtest/ahci-test.c
View File

@ -1590,7 +1590,7 @@ static void test_atapi_tray(void)
qtest_qmp_send(ahci->parent->qts, "{'execute': 'blockdev-open-tray', "
"'arguments': {'id': 'cd0'}}");
atapi_wait_tray(ahci, true);
rsp = qtest_qmp_receive(ahci->parent->qts);
rsp = qtest_qmp_receive_dict(ahci->parent->qts);
qobject_unref(rsp);
qmp_discard_response(ahci->parent->qts,
@ -1620,7 +1620,7 @@ static void test_atapi_tray(void)
qtest_qmp_send(ahci->parent->qts, "{'execute': 'blockdev-close-tray', "
"'arguments': {'id': 'cd0'}}");
atapi_wait_tray(ahci, false);
rsp = qtest_qmp_receive(ahci->parent->qts);
rsp = qtest_qmp_receive_dict(ahci->parent->qts);
qobject_unref(rsp);
/* Now, to convince ATAPI we understand the media has changed... */

2
tests/qtest/device-plug-test.c
View File

@ -23,7 +23,7 @@ static void device_del_start(QTestState *qtest, const char *id)
static void device_del_finish(QTestState *qtest)
{
QDict *resp = qtest_qmp_receive(qtest);
QDict *resp = qtest_qmp_receive_dict(qtest);
g_assert(qdict_haskey(resp, "return"));
qobject_unref(resp);

2
tests/qtest/drive_del-test.c
View File

@ -41,7 +41,7 @@ static void device_del(QTestState *qts)
/* Complication: ignore DEVICE_DELETED event */
qmp_discard_response(qts, "{'execute': 'device_del',"
" 'arguments': { 'id': 'dev0' } }");
response = qtest_qmp_receive(qts);
response = qtest_qmp_receive_dict(qts);
g_assert(response);
g_assert(qdict_haskey(response, "return"));
qobject_unref(response);

4
tests/qtest/libqos/libqtest.h
View File

@ -191,12 +191,12 @@ void qtest_qmp_vsend(QTestState *s, const char *fmt, va_list ap)
GCC_FMT_ATTR(2, 0);
/**
* qtest_receive:
* qtest_qmp_receive_dict:
* @s: #QTestState instance to operate on.
*
* Reads a QMP message from QEMU and returns the response.
*/
QDict *qtest_qmp_receive(QTestState *s);
QDict *qtest_qmp_receive_dict(QTestState *s);
/**
* qtest_qmp_eventwait:

16
tests/qtest/libqtest.c
View File

@ -322,7 +322,7 @@ QTestState *qtest_init(const char *extra_args)
QDict *greeting;
/* Read the QMP greeting and then do the handshake */
greeting = qtest_qmp_receive(s);
greeting = qtest_qmp_receive_dict(s);
qobject_unref(greeting);
qobject_unref(qtest_qmp(s, "{ 'execute': 'qmp_capabilities' }"));
@ -603,7 +603,7 @@ QDict *qmp_fd_receive(int fd)
return qmp.response;
}
QDict *qtest_qmp_receive(QTestState *s)
QDict *qtest_qmp_receive_dict(QTestState *s)
{
return qmp_fd_receive(s->qmp_fd);
}
@ -678,7 +678,7 @@ QDict *qtest_vqmp_fds(QTestState *s, int *fds, size_t fds_num,
qtest_qmp_vsend_fds(s, fds, fds_num, fmt, ap);
/* Receive reply */
return qtest_qmp_receive(s);
return qtest_qmp_receive_dict(s);
}
QDict *qtest_vqmp(QTestState *s, const char *fmt, va_list ap)
@ -686,7 +686,7 @@ QDict *qtest_vqmp(QTestState *s, const char *fmt, va_list ap)
qtest_qmp_vsend(s, fmt, ap);
/* Receive reply */
return qtest_qmp_receive(s);
return qtest_qmp_receive_dict(s);
}
QDict *qmp_fd(int fd, const char *fmt, ...)
@ -776,7 +776,7 @@ QDict *qtest_qmp_eventwait_ref(QTestState *s, const char *event)
QDict *response;
for (;;) {
response = qtest_qmp_receive(s);
response = qtest_qmp_receive_dict(s);
if ((qdict_haskey(response, "event")) &&
(strcmp(qdict_get_str(response, "event"), event) == 0)) {
return response;
@ -807,7 +807,7 @@ char *qtest_vhmp(QTestState *s, const char *fmt, va_list ap)
while (ret == NULL && qdict_get_try_str(resp, "event")) {
/* Ignore asynchronous QMP events */
qobject_unref(resp);
resp = qtest_qmp_receive(s);
resp = qtest_qmp_receive_dict(s);
ret = g_strdup(qdict_get_try_str(resp, "return"));
}
g_assert(ret);
@ -1255,7 +1255,7 @@ QDict *qtest_qmp_receive_success(QTestState *s,
const char *event;
for (;;) {
response = qtest_qmp_receive(s);
response = qtest_qmp_receive_dict(s);
g_assert(!qdict_haskey(response, "error"));
ret = qdict_get_qdict(response, "return");
if (ret) {
@ -1345,7 +1345,7 @@ void qtest_qmp_device_del(QTestState *qts, const char *id)
rsp = qtest_qmp_receive_success(qts, device_deleted_cb, &got_event);
qobject_unref(rsp);
if (!got_event) {
rsp = qtest_qmp_receive(qts);
rsp = qtest_qmp_receive_dict(qts);
g_assert_cmpstr(qdict_get_try_str(rsp, "event"),
==, "DEVICE_DELETED");
qobject_unref(rsp);

2
tests/qtest/pvpanic-test.c
View File

@ -24,7 +24,7 @@ static void test_panic(void)
qtest_outb(qts, 0x505, 0x1);
response = qtest_qmp_receive(qts);
response = qtest_qmp_receive_dict(qts);
g_assert(qdict_haskey(response, "event"));
g_assert_cmpstr(qdict_get_str(response, "event"), ==, "GUEST_PANICKED");
g_assert(qdict_haskey(response, "data"));

18
tests/qtest/qmp-test.c
View File

@ -47,37 +47,37 @@ static void test_malformed(QTestState *qts)
/* syntax error */
qtest_qmp_send_raw(qts, "{]\n");
resp = qtest_qmp_receive(qts);
resp = qtest_qmp_receive_dict(qts);
qmp_expect_error_and_unref(resp, "GenericError");
assert_recovered(qts);
/* lexical error: impossible byte outside string */
qtest_qmp_send_raw(qts, "{\xFF");
resp = qtest_qmp_receive(qts);
resp = qtest_qmp_receive_dict(qts);
qmp_expect_error_and_unref(resp, "GenericError");
assert_recovered(qts);
/* lexical error: funny control character outside string */
qtest_qmp_send_raw(qts, "{\x01");
resp = qtest_qmp_receive(qts);
resp = qtest_qmp_receive_dict(qts);
qmp_expect_error_and_unref(resp, "GenericError");
assert_recovered(qts);
/* lexical error: impossible byte in string */
qtest_qmp_send_raw(qts, "{'bad \xFF");
resp = qtest_qmp_receive(qts);
resp = qtest_qmp_receive_dict(qts);
qmp_expect_error_and_unref(resp, "GenericError");
assert_recovered(qts);
/* lexical error: control character in string */
qtest_qmp_send_raw(qts, "{'execute': 'nonexistent', 'id':'\n");
resp = qtest_qmp_receive(qts);
resp = qtest_qmp_receive_dict(qts);
qmp_expect_error_and_unref(resp, "GenericError");
assert_recovered(qts);
/* lexical error: interpolation */
qtest_qmp_send_raw(qts, "%%p");
resp = qtest_qmp_receive(qts);
resp = qtest_qmp_receive_dict(qts);
qmp_expect_error_and_unref(resp, "GenericError");
assert_recovered(qts);
@ -111,7 +111,7 @@ static void test_qmp_protocol(void)
qts = qtest_init_without_qmp_handshake(common_args);
/* Test greeting */
resp = qtest_qmp_receive(qts);
resp = qtest_qmp_receive_dict(qts);
q = qdict_get_qdict(resp, "QMP");
g_assert(q);
test_version(qdict_get(q, "version"));
@ -205,7 +205,7 @@ static void send_oob_cmd_that_fails(QTestState *s, const char *id)
static void recv_cmd_id(QTestState *s, const char *id)
{
QDict *resp = qtest_qmp_receive(s);
QDict *resp = qtest_qmp_receive_dict(s);
g_assert_cmpstr(qdict_get_try_str(resp, "id"), ==, id);
qobject_unref(resp);
@ -222,7 +222,7 @@ static void test_qmp_oob(void)
qts = qtest_init_without_qmp_handshake(common_args);
/* Check the greeting message. */
resp = qtest_qmp_receive(qts);
resp = qtest_qmp_receive_dict(qts);
q = qdict_get_qdict(resp, "QMP");
g_assert(q);
capabilities = qdict_get_qlist(q, "capabilities");