From patchwork Wed Jun 18 16:24:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 361661 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1ACE3140087 for ; Thu, 19 Jun 2014 02:48:40 +1000 (EST) Received: from localhost ([::1]:59243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxJ2M-0006gE-A6 for incoming@patchwork.ozlabs.org; Wed, 18 Jun 2014 12:48:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxIf4-0000sG-Du for qemu-devel@nongnu.org; Wed, 18 Jun 2014 12:24:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxIev-0001zi-Hh for qemu-devel@nongnu.org; Wed, 18 Jun 2014 12:24:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxIev-0001za-6o for qemu-devel@nongnu.org; Wed, 18 Jun 2014 12:24:25 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5IGOKJd017665 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jun 2014 12:24:21 -0400 Received: from z.redhat.com (vpn1-114-59.nay.redhat.com [10.66.114.59]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5IGOERH032681; Wed, 18 Jun 2014 12:24:18 -0400 From: Amos Kong To: qemu-devel@nongnu.org Date: Thu, 19 Jun 2014 00:24:10 +0800 Message-Id: <1403108653-26765-2-git-send-email-akong@redhat.com> In-Reply-To: <1403108653-26765-1-git-send-email-akong@redhat.com> References: <1403108653-26765-1-git-send-email-akong@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, stefanha@gmail.com, arei.gonglei@huawei.com, afaerber@suse.de, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v5 1/4] qtest: introduce qmp_exec_hmp_cmd() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 | 23 +++++++++++++++++++++++ tests/libqtest.h | 9 +++++++++ 2 files changed, 32 insertions(+) diff --git a/tests/libqtest.c b/tests/libqtest.c index 98e8f4b..80e0024 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -673,3 +673,26 @@ 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]; + QDict *response; + const char *response_return; + + va_start(ap, fmt); + vsprintf(cmd, fmt, ap); + va_end(ap); + + response = qmp("{'execute': 'human-monitor-command'," + " 'arguments': {" + " 'command-line': %s" + "}}", 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.