From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsvDh-0001U8-JL for qemu-devel@nongnu.org; Fri, 06 Jun 2014 10:34:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsvDZ-0001Hm-R4 for qemu-devel@nongnu.org; Fri, 06 Jun 2014 10:34:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13489) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsvDZ-0001Fn-9A for qemu-devel@nongnu.org; Fri, 06 Jun 2014 10:34:05 -0400 From: Amos Kong Date: Fri, 6 Jun 2014 22:33:51 +0800 Message-Id: <1402065233-31894-3-git-send-email-akong@redhat.com> In-Reply-To: <1402065233-31894-1-git-send-email-akong@redhat.com> References: <1402065233-31894-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH v4 2/4] qtest: introduce qmp_exec_hmp_cmd() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@gmail.com, arei.gonglei@huawei.com, afaerber@suse.de This patch wraps a helper function to execute human command by one QMP command (human-monitor-command). It also checks the return string. Signed-off-by: Amos Kong --- tests/libqtest.c | 26 ++++++++++++++++++++++++++ tests/libqtest.h | 9 +++++++++ 2 files changed, 35 insertions(+) diff --git a/tests/libqtest.c b/tests/libqtest.c index 71468ac..90babc9 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -646,3 +646,29 @@ void qmp_discard_response(const char *fmt, ...) qtest_qmpv_discard_response(global_qtest, fmt, ap); va_end(ap); } + +void qmp_exec_hmp_cmd(const char *expected_ret, const char *fmt, ...) +{ + va_list ap; + char cmd[1024]; + char *escaped_cmd; + QDict *response; + const char *response_return; + + va_start(ap, fmt); + vsprintf(cmd, fmt, ap); + va_end(ap); + + escaped_cmd = g_strescape(cmd, NULL); + response = qmp("{\"execute\": \"human-monitor-command\"," + " \"arguments\": {" + " \"command-line\": \"%s\"" + "}}", escaped_cmd); + g_free(escaped_cmd); + + g_assert(response); + response_return = qdict_get_try_str(response, "return"); + g_assert(response_return); + g_assert_cmpstr(response_return, ==, expected_ret); + QDECREF(response); +} diff --git a/tests/libqtest.h b/tests/libqtest.h index 8f323c7..d2959d3 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -375,6 +375,15 @@ QDict *qmp(const char *fmt, ...); void qmp_discard_response(const char *fmt, ...); /** + * qmp_exec_hmp_cmd: + * @expected_ret: expected return string + * @fmt...: HMP command to execute + * + * Executes HMP command by 'human-monitor-command'. + */ +void qmp_exec_hmp_cmd(const char *expected_ret, const char *fmt, ...); + +/** * qmp_receive: * * Reads a QMP message from QEMU and returns the response. -- 1.9.3