qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Amos Kong <akong@redhat.com>
To: qemu-devel@nongnu.org
Cc: stefanha@gmail.com, arei.gonglei@huawei.com, afaerber@suse.de
Subject: [Qemu-devel] [PATCH v4 2/4] qtest: introduce qmp_exec_hmp_cmd()
Date: Fri,  6 Jun 2014 22:33:51 +0800	[thread overview]
Message-ID: <1402065233-31894-3-git-send-email-akong@redhat.com> (raw)
In-Reply-To: <1402065233-31894-1-git-send-email-akong@redhat.com>

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 <akong@redhat.com>
---
 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

  parent reply	other threads:[~2014-06-06 14:34 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-06 14:33 [Qemu-devel] [PATCH v4 0/4] test virtio-blk hotplug Amos Kong
2014-06-06 14:33 ` [Qemu-devel] [PATCH v4 1/4] virtio-blk-test.c: change pci_nop() to virtblk_init() Amos Kong
2014-06-06 14:33 ` Amos Kong [this message]
2014-06-17 13:16   ` [Qemu-devel] [PATCH v4 2/4] qtest: introduce qmp_exec_hmp_cmd() Andreas Färber
2014-06-17 17:37   ` Paolo Bonzini
2014-06-18  6:29     ` Amos Kong
2014-06-18  7:05       ` Paolo Bonzini
2014-06-06 14:33 ` [Qemu-devel] [PATCH v4 3/4] virtio-blk-test.c: add hotplug subtest Amos Kong
2014-06-17 13:25   ` Andreas Färber
2014-06-18  6:40     ` Amos Kong
2014-06-18 10:26       ` Andreas Färber
2014-06-06 14:33 ` [Qemu-devel] [PATCH v4 4/4] qtest: use qmp_exec_hmp_cmd() in blockdev-test Amos Kong
2014-06-17 13:28   ` Andreas Färber
2014-06-09 13:22 ` [Qemu-devel] [PATCH v4 0/4] test virtio-blk hotplug Stefan Hajnoczi
2014-06-17 12:54   ` Amos Kong
2014-06-17 13:37     ` Andreas Färber
2014-06-18  2:58       ` Amos Kong
2014-06-18  3:04         ` Stefan Hajnoczi
2014-06-18  5:46         ` Amos Kong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1402065233-31894-3-git-send-email-akong@redhat.com \
    --to=akong@redhat.com \
    --cc=afaerber@suse.de \
    --cc=arei.gonglei@huawei.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).