qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <shajnocz@redhat.com>,
	"Daniel P . Berrange" <berrange@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <famz@redhat.com>,
	Juan Quintela <quintela@redhat.com>,
	mdroth@linux.vnet.ibm.com, peterx@redhat.com,
	Eric Blake <eblake@redhat.com>,
	Laurent Vivier <lvivier@redhat.com>,
	Markus Armbruster <armbru@redhat.com>,
	marcandre.lureau@redhat.com,
	"Dr . David Alan Gilbert" <dgilbert@redhat.com>
Subject: [Qemu-devel] [PATCH v7 23/23] tests: qmp-test: add oob test
Date: Wed, 24 Jan 2018 13:39:57 +0800	[thread overview]
Message-ID: <20180124053957.29145-24-peterx@redhat.com> (raw)
In-Reply-To: <20180124053957.29145-1-peterx@redhat.com>

Test the new OOB capability.  Here we used the new "x-oob-test" command.
Firstly, we send a lock=true and oob=false command to hang the main
thread.  Then send another lock=false and oob=true command (which will
be run inside parser this time) to free that hanged command.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
 tests/qmp-test.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/tests/qmp-test.c b/tests/qmp-test.c
index 19fa774486..c41e8305b6 100644
--- a/tests/qmp-test.c
+++ b/tests/qmp-test.c
@@ -160,6 +160,70 @@ static void test_qmp_protocol(void)
     qtest_end();
 }
 
+/* Tests for Out-Of-Band support. */
+static void test_qmp_oob(void)
+{
+    QDict *resp;
+    int acks = 0;
+    const char *cmd_id;
+
+    global_qtest = qtest_init_without_qmp_handshake(common_args);
+
+    /* Ignore the greeting message. */
+    resp = qmp_receive();
+    g_assert(qdict_get_qdict(resp, "QMP"));
+    QDECREF(resp);
+
+    /* Try a fake capability, it should fail. */
+    resp = qmp("{ 'execute': 'qmp_capabilities', "
+               "  'arguments': { 'enable': [ 'cap-does-not-exist' ] } }");
+    g_assert(qdict_haskey(resp, "error"));
+    QDECREF(resp);
+
+    /* Now, enable OOB in current QMP session, it should success. */
+    resp = qmp("{ 'execute': 'qmp_capabilities', "
+               "  'arguments': { 'enable': [ 'oob' ] } }");
+    g_assert(qdict_haskey(resp, "return"));
+    QDECREF(resp);
+
+    /*
+     * Try any command that does not support OOB but with OOB flag. We
+     * should get failure.
+     */
+    resp = qmp("{ 'execute': 'query-cpus',"
+               "  'control': { 'run-oob': true } }");
+    g_assert(qdict_haskey(resp, "error"));
+    QDECREF(resp);
+
+    /*
+     * Firstly send the "x-oob-test" command with lock=true and
+     * oob=false, it should hang the dispatcher and main thread;
+     * later, we send another lock=false with oob=true to continue
+     * that thread processing.  Finally we should receive replies from
+     * both commands.
+     */
+    qmp_async("{ 'execute': 'x-oob-test',"
+              "  'arguments': { 'lock': true }, "
+              "  'id': 'lock-cmd'}");
+    qmp_async("{ 'execute': 'x-oob-test', "
+              "  'arguments': { 'lock': false }, "
+              "  'control': { 'run-oob': true }, "
+              "  'id': 'unlock-cmd' }");
+
+    /* Ignore all events.  Wait for 2 acks */
+    while (acks < 2) {
+        resp = qmp_receive();
+        cmd_id = qdict_get_str(resp, "id");
+        if (!g_strcmp0(cmd_id, "lock-cmd") ||
+            !g_strcmp0(cmd_id, "unlock-cmd")) {
+            acks++;
+        }
+        QDECREF(resp);
+    }
+
+    qtest_end();
+}
+
 static int query_error_class(const char *cmd)
 {
     static struct {
@@ -339,6 +403,7 @@ int main(int argc, char *argv[])
     g_test_init(&argc, &argv, NULL);
 
     qtest_add_func("qmp/protocol", test_qmp_protocol);
+    qtest_add_func("qmp/oob", test_qmp_oob);
     qmp_schema_init(&schema);
     add_query_tests(&schema);
 
-- 
2.14.3

  parent reply	other threads:[~2018-01-24  5:43 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-24  5:39 [Qemu-devel] [PATCH v7 00/23] QMP: out-of-band (OOB) execution support Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 01/23] docs: update QMP documents for OOB commands Peter Xu
2018-02-09 14:10   ` Eric Blake
2018-02-11  5:34     ` Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 02/23] qobject: introduce qstring_get_try_str() Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 03/23] qobject: introduce qobject_get_try_str() Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 04/23] qobject: let object_property_get_str() use new API Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 05/23] monitor: move skip_flush into monitor_data_init Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 06/23] monitor: move the cur_mon hack deeper for QMP Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 07/23] monitor: unify global init Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 08/23] monitor: let mon_list be tail queue Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 09/23] monitor: allow using IO thread for parsing Peter Xu
2018-02-21 16:00   ` Stefan Hajnoczi
2018-02-22 10:01     ` Peter Xu
2018-02-22 15:41       ` Stefan Hajnoczi
2018-02-22 15:50       ` Daniel P. Berrangé
2018-02-23  2:56         ` Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 10/23] qmp: introduce QMPCapability Peter Xu
2018-02-21 16:17   ` Stefan Hajnoczi
2018-02-22 10:42     ` Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 11/23] monitor: introduce monitor_qmp_respond() Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 12/23] monitor: let suspend_cnt be thread safe Peter Xu
2018-02-21 16:44   ` Stefan Hajnoczi
2018-02-21 16:45   ` Stefan Hajnoczi
2018-02-21 16:45   ` Stefan Hajnoczi
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 13/23] monitor: let suspend/resume work even with QMPs Peter Xu
2018-02-21 16:50   ` Stefan Hajnoczi
2018-02-22 10:49     ` Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 14/23] monitor: separate QMP parser and dispatcher Peter Xu
2018-02-21 17:17   ` Stefan Hajnoczi
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 15/23] qmp: add new event "command-dropped" Peter Xu
2018-02-21 17:19   ` Stefan Hajnoczi
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 16/23] monitor: send event when command queue full Peter Xu
2018-02-21 17:23   ` Stefan Hajnoczi
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 17/23] qapi: introduce new cmd option "allow-oob" Peter Xu
2018-03-08 10:04   ` Igor Mammedov
2018-03-08 11:43     ` Peter Xu
2018-03-08 11:51     ` Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 18/23] qmp: support out-of-band (oob) execution Peter Xu
2018-02-21 17:34   ` Stefan Hajnoczi
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 19/23] qmp: isolate responses into io thread Peter Xu
2018-02-21 17:44   ` Stefan Hajnoczi
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 20/23] monitor: enable IO thread for (qmp & !mux) typed Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 21/23] qmp: add command "x-oob-test" Peter Xu
2018-01-24  5:39 ` [Qemu-devel] [PATCH v7 22/23] tests: qmp-test: verify command batching Peter Xu
2018-01-24  5:39 ` Peter Xu [this message]
2018-01-25  2:35 ` [Qemu-devel] [PATCH v7 00/23] QMP: out-of-band (OOB) execution support Peter Xu
2018-01-25 10:01   ` Dr. David Alan Gilbert
2018-02-08  6:44 ` Peter Xu
2018-02-21 17:45 ` Stefan Hajnoczi

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=20180124053957.29145-24-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=eblake@redhat.com \
    --cc=famz@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=shajnocz@redhat.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).