mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-25 11:53:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

libqtest: Rename functions to send QMP messages

Browse Source 
The functions to receive messages are called qtest_qmp_receive() and
qmp_receive(), qmp_fd_receive().  The ones to send messages are called
qtest_async_qmp(), qtest_async_qmpv(), qmp_async(), qmp_fd_send(),
qmp_fd_sendv().  Inconsistent.  Rename the *_async* ones to
qmp_send(), qtest_qmp_send(), qtest_qmp_vsend().  Rename
qmp_fd_sendv() to qmp_fd_vsend().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180806065344.7103-2-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2018-08-06 08:53:22 +02:00
parent c146b54c7f
commit 4277f1ebd9
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/ahci-test.c
View File

@ -1389,7 +1389,7 @@ static void test_flush_migrate(void)
/* Complete the command */
s = "{'execute':'cont' }";
qmp_async(s);
qmp_send(s);
qmp_eventwait("RESUME");
ahci_command_wait(dst, cmd);
ahci_command_verify(dst, cmd);
@ -1592,8 +1592,8 @@ static void test_atapi_tray(void)
atapi_wait_tray(false);
/* Remove media */
qmp_async("{'execute': 'blockdev-open-tray', "
"'arguments': {'id': 'cd0'}}");
qmp_send("{'execute': 'blockdev-open-tray',"
" 'arguments': {'id': 'cd0'}}");
atapi_wait_tray(true);
rsp = qmp_receive();
qobject_unref(rsp);
@ -1619,8 +1619,8 @@ static void test_atapi_tray(void)
"'node-name': 'node0' }}");
/* Again, the event shows up first */
qmp_async("{'execute': 'blockdev-close-tray', "
"'arguments': {'id': 'cd0'}}");
qmp_send("{'execute': 'blockdev-close-tray',"
" 'arguments': {'id': 'cd0'}}");
atapi_wait_tray(false);
rsp = qmp_receive();
qobject_unref(rsp);

4
tests/libqos/ahci.c
View File

@ -674,7 +674,7 @@ void ahci_exec(AHCIQState *ahci, uint8_t port,
g_assert_cmpint(rc, ==, 0);
}
if (opts->error) {
qtest_async_qmp(ahci->parent->qts, "{'execute':'cont' }");
qtest_qmp_send(ahci->parent->qts, "{'execute':'cont' }");
qtest_qmp_eventwait(ahci->parent->qts, "RESUME");
}
@ -712,7 +712,7 @@ AHCICommand *ahci_guest_io_halt(AHCIQState *ahci, uint8_t port,
void ahci_guest_io_resume(AHCIQState *ahci, AHCICommand *cmd)
{
/* Complete the command */
qtest_async_qmp(ahci->parent->qts, "{'execute':'cont' }");
qtest_qmp_send(ahci->parent->qts, "{'execute':'cont' }");
qtest_qmp_eventwait(ahci->parent->qts, "RESUME");
ahci_command_wait(ahci, cmd);
ahci_command_verify(ahci, cmd);

20
tests/libqtest.c
View File

@ -484,7 +484,7 @@ QDict *qtest_qmp_receive(QTestState *s)
* in the case that they choose to discard all replies up until
* a particular EVENT is received.
*/
void qmp_fd_sendv(int fd, const char *fmt, va_list ap)
void qmp_fd_vsend(int fd, const char *fmt, va_list ap)
{
va_list ap_copy;
QObject *qobj;
@ -529,21 +529,21 @@ void qmp_fd_sendv(int fd, const char *fmt, va_list ap)
}
}
void qtest_async_qmpv(QTestState *s, const char *fmt, va_list ap)
void qtest_qmp_vsend(QTestState *s, const char *fmt, va_list ap)
{
qmp_fd_sendv(s->qmp_fd, fmt, ap);
qmp_fd_vsend(s->qmp_fd, fmt, ap);
}
QDict *qmp_fdv(int fd, const char *fmt, va_list ap)
{
qmp_fd_sendv(fd, fmt, ap);
qmp_fd_vsend(fd, fmt, ap);
return qmp_fd_receive(fd);
}
QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap)
{
qtest_async_qmpv(s, fmt, ap);
qtest_qmp_vsend(s, fmt, ap);
/* Receive reply */
return qtest_qmp_receive(s);
@ -565,7 +565,7 @@ void qmp_fd_send(int fd, const char *fmt, ...)
va_list ap;
va_start(ap, fmt);
qmp_fd_sendv(fd, fmt, ap);
qmp_fd_vsend(fd, fmt, ap);
va_end(ap);
}
@ -580,12 +580,12 @@ QDict *qtest_qmp(QTestState *s, const char *fmt, ...)
return response;
}
void qtest_async_qmp(QTestState *s, const char *fmt, ...)
void qtest_qmp_send(QTestState *s, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
qtest_async_qmpv(s, fmt, ap);
qtest_qmp_vsend(s, fmt, ap);
va_end(ap);
}
@ -968,12 +968,12 @@ QDict *qmp(const char *fmt, ...)
return response;
}
void qmp_async(const char *fmt, ...)
void qmp_send(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
qtest_async_qmpv(global_qtest, fmt, ap);
qtest_qmp_vsend(global_qtest, fmt, ap);
va_end(ap);
}

14
tests/libqtest.h
View File

@ -92,13 +92,13 @@ void qtest_qmp_discard_response(QTestState *s, const char *fmt, ...);
QDict *qtest_qmp(QTestState *s, const char *fmt, ...);
/**
* qtest_async_qmp:
* qtest_qmp_send:
* @s: #QTestState instance to operate on.
* @fmt...: QMP message to send to qemu
*
* Sends a QMP message to QEMU and leaves the response in the stream.
*/
void qtest_async_qmp(QTestState *s, const char *fmt, ...);
void qtest_qmp_send(QTestState *s, const char *fmt, ...);
/**
* qtest_qmpv_discard_response:
@ -121,14 +121,14 @@ void qtest_qmpv_discard_response(QTestState *s, const char *fmt, va_list ap);
QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap);
/**
* qtest_async_qmpv:
* qtest_qmp_vsend:
* @s: #QTestState instance to operate on.
* @fmt: QMP message to send to QEMU
* @ap: QMP message arguments
*
* Sends a QMP message to QEMU and leaves the response in the stream.
*/
void qtest_async_qmpv(QTestState *s, const char *fmt, va_list ap);
void qtest_qmp_vsend(QTestState *s, const char *fmt, va_list ap);
/**
* qtest_receive:
@ -568,12 +568,12 @@ static inline void qtest_end(void)
QDict *qmp(const char *fmt, ...);
/**
* qmp_async:
* qmp_send:
* @fmt...: QMP message to send to qemu
*
* Sends a QMP message to QEMU and leaves the response in the stream.
*/
void qmp_async(const char *fmt, ...);
void qmp_send(const char *fmt, ...);
/**
* qmp_discard_response:
@ -940,7 +940,7 @@ static inline int64_t clock_set(int64_t val)
}
QDict *qmp_fd_receive(int fd);
void qmp_fd_sendv(int fd, const char *fmt, va_list ap);
void qmp_fd_vsend(int fd, const char *fmt, va_list ap);
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, ...);

18
tests/qmp-test.c
View File

@ -159,12 +159,12 @@ static void cleanup_blocking_cmd(void)
static void send_cmd_that_blocks(QTestState *s, const char *id)
{
qtest_async_qmp(s, "{ 'execute': 'blockdev-add', 'id': %s,"
" 'arguments': {"
" 'driver': 'blkdebug', 'node-name': %s,"
" 'config': %s,"
" 'image': { 'driver': 'null-co' } } }",
id, id, fifo_name);
qtest_qmp_send(s, "{ 'execute': 'blockdev-add', 'id': %s,"
" 'arguments': {"
" 'driver': 'blkdebug', 'node-name': %s,"
" 'config': %s,"
" 'image': { 'driver': 'null-co' } } }",
id, id, fifo_name);
}
static void unblock_blocked_cmd(void)
@ -176,7 +176,7 @@ static void unblock_blocked_cmd(void)
static void send_oob_cmd_that_fails(QTestState *s, const char *id)
{
qtest_async_qmp(s, "{ 'exec-oob': 'migrate-pause', 'id': %s }", id);
qtest_qmp_send(s, "{ 'exec-oob': 'migrate-pause', 'id': %s }", id);
}
static void recv_cmd_id(QTestState *s, const char *id)
@ -235,7 +235,7 @@ static void test_qmp_oob(void)
/* OOB command overtakes slow in-band command */
setup_blocking_cmd();
send_cmd_that_blocks(qts, "ib-blocks-1");
qtest_async_qmp(qts, "{ 'execute': 'query-name', 'id': 'ib-quick-1' }");
qtest_qmp_send(qts, "{ 'execute': 'query-name', 'id': 'ib-quick-1' }");
send_oob_cmd_that_fails(qts, "oob-1");
recv_cmd_id(qts, "oob-1");
unblock_blocked_cmd();
@ -244,7 +244,7 @@ static void test_qmp_oob(void)
/* Even malformed in-band command fails in-band */
send_cmd_that_blocks(qts, "blocks-2");
qtest_async_qmp(qts, "{ 'id': 'err-2' }");
qtest_qmp_send(qts, "{ 'id': 'err-2' }");
unblock_blocked_cmd();
recv_cmd_id(qts, "blocks-2");
recv_cmd_id(qts, "err-2");