qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 01/32] qmp: Say "out-of-band" instead of "Out-Of-Band"
Date: Tue,  3 Jul 2018 17:36:57 +0200	[thread overview]
Message-ID: <20180703153728.2175-2-armbru@redhat.com> (raw)
In-Reply-To: <20180703153728.2175-1-armbru@redhat.com>

Affects documentation and a few error messages.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180703085358.13941-2-armbru@redhat.com>
---
 docs/devel/qapi-code-gen.txt            |  2 +-
 docs/interop/qmp-spec.txt               |  2 +-
 monitor.c                               | 14 +++++++-------
 qapi/misc.json                          |  2 +-
 tests/qapi-schema/qapi-schema-test.json |  2 +-
 tests/qmp-test.c                        |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt
index 94a7e8f4d0..9625798d16 100644
--- a/docs/devel/qapi-code-gen.txt
+++ b/docs/devel/qapi-code-gen.txt
@@ -641,7 +641,7 @@ possible, the command expression should include the optional key
 'success-response' with boolean value false.  So far, only QGA makes
 use of this member.
 
-A command can be declared to support Out-Of-Band (OOB) execution.  By
+A command can be declared to support out-of-band (OOB) execution.  By
 default, commands do not support OOB.  To declare a command that
 supports it, the schema includes an extra 'allow-oob' field.  For
 example:
diff --git a/docs/interop/qmp-spec.txt b/docs/interop/qmp-spec.txt
index 6fa193a80b..2bb492d1ea 100644
--- a/docs/interop/qmp-spec.txt
+++ b/docs/interop/qmp-spec.txt
@@ -85,7 +85,7 @@ The greeting message format is:
 
 Currently supported capabilities are:
 
-- "oob": the QMP server supports "Out-Of-Band" (OOB) command
+- "oob": the QMP server supports "out-of-band" (OOB) command
   execution.  For more details, please see the "run-oob" parameter in
   the "Issuing Commands" section below.  Not all commands allow this
   "oob" execution.  The "query-qmp-schema" command can be used to
diff --git a/monitor.c b/monitor.c
index 3a0ea0c602..208d7c7cfd 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1268,11 +1268,11 @@ static void qmp_caps_check(Monitor *mon, QMPCapabilityList *list,
         case QMP_CAPABILITY_OOB:
             if (!mon->use_io_thr) {
                 /*
-                 * Out-Of-Band only works with monitors that are
+                 * Out-of-band only works with monitors that are
                  * running on dedicated IOThread.
                  */
                 error_setg(errp, "This monitor does not support "
-                           "Out-Of-Band (OOB)");
+                           "out-of-band (OOB)");
                 return;
             }
             break;
@@ -1320,7 +1320,7 @@ static bool qmp_cmd_oob_check(Monitor *mon, QDict *req, Error **errp)
 
     if (qmp_is_oob(req)) {
         if (!qmp_oob_enabled(mon)) {
-            error_setg(errp, "Please enable Out-Of-Band first "
+            error_setg(errp, "Please enable out-of-band first "
                        "for the session during capabilities negotiation");
             return false;
         }
@@ -4294,7 +4294,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)
 
     /* When OOB is enabled, the "id" field is mandatory. */
     if (qmp_oob_enabled(mon) && !id) {
-        error_setg(&err, "Out-Of-Band capability requires that "
+        error_setg(&err, "Out-of-band capability requires that "
                    "every command contains an 'id' field");
         goto err;
     }
@@ -4308,7 +4308,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens)
     qdict_del(qdict, "id");
 
     if (qmp_is_oob(qdict)) {
-        /* Out-Of-Band (OOB) requests are executed directly in parser. */
+        /* Out-of-band (OOB) requests are executed directly in parser. */
         trace_monitor_qmp_cmd_out_of_band(qobject_get_try_str(req_obj->id)
                                           ?: "");
         monitor_qmp_dispatch_one(req_obj);
@@ -4684,12 +4684,12 @@ void monitor_init(Chardev *chr, int flags)
 
     if (use_oob) {
         if (CHARDEV_IS_MUX(chr)) {
-            error_report("Monitor Out-Of-Band is not supported with "
+            error_report("Monitor out-of-band is not supported with "
                          "MUX typed chardev backend");
             exit(1);
         }
         if (use_readline) {
-            error_report("Monitor Out-Of-band is only supported by QMP");
+            error_report("Monitor out-of-band is only supported by QMP");
             exit(1);
         }
     }
diff --git a/qapi/misc.json b/qapi/misc.json
index 29da7856e3..0446c3e48e 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -46,7 +46,7 @@
 # Enumeration of capabilities to be advertised during initial client
 # connection, used for agreeing on particular QMP extension behaviors.
 #
-# @oob:   QMP ability to support Out-Of-Band requests.
+# @oob:   QMP ability to support out-of-band requests.
 #         (Please refer to qmp-spec.txt for more information on OOB)
 #
 # Since: 2.12
diff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json
index 7b59817f04..e9e401c01f 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -141,7 +141,7 @@
 { 'command': 'boxed-struct', 'boxed': true, 'data': 'UserDefZero' }
 { 'command': 'boxed-union', 'data': 'UserDefNativeListUnion', 'boxed': true }
 
-# Smoke test on Out-Of-Band and allow-preconfig-test
+# Smoke test on out-of-band and allow-preconfig-test
 { 'command': 'test-flags-command', 'allow-oob': true, 'allow-preconfig': true }
 
 # For testing integer range flattening in opts-visitor. The following schema
diff --git a/tests/qmp-test.c b/tests/qmp-test.c
index a49cbc6fde..5206b14ca6 100644
--- a/tests/qmp-test.c
+++ b/tests/qmp-test.c
@@ -135,7 +135,7 @@ static void test_qmp_protocol(void)
     qtest_quit(qts);
 }
 
-/* Tests for Out-Of-Band support. */
+/* Tests for out-of-band support. */
 static void test_qmp_oob(void)
 {
     QTestState *qts;
-- 
2.17.1

  reply	other threads:[~2018-07-03 15:37 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-03 15:36 [Qemu-devel] [PULL 00/32] Monitor patches for 2018-07-03 Markus Armbruster
2018-07-03 15:36 ` Markus Armbruster [this message]
2018-07-03 15:36 ` [Qemu-devel] [PULL 02/32] monitor: Spell "I/O thread" consistently in comments Markus Armbruster
2018-07-03 15:36 ` [Qemu-devel] [PULL 03/32] docs/interop/qmp: Improve OOB documentation Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 04/32] qmp: Document COMMAND_DROPPED design flaw Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 05/32] qmp: Get rid of x-oob-test command Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 06/32] tests/qmp-test: Test in-band command doesn't overtake Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 07/32] qmp: Make "id" optional again even in "oob" monitors Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 08/32] tests/test-qga: Demonstrate the guest-agent ignores "id" Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 09/32] qmp qemu-ga: Revert change that accidentally made qemu-ga accept "id" Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 10/32] tests/test-qga: Demonstrate the guest-agent ignores "control" Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 11/32] qmp qemu-ga: Fix qemu-ga not to accept "control" Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 12/32] qmp: Redo how the client requests out-of-band execution Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 13/32] qmp: Revert change to handle_qmp_command tracepoint Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 14/32] qmp: Always free QMPRequest with qmp_request_free() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 15/32] qmp: Simplify code around monitor_qmp_dispatch_one() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 16/32] tests/qmp-test: Demonstrate QMP errors jumping the queue Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 17/32] qmp: Don't let malformed in-band commands jump " Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 18/32] qmp: Don't let JSON errors " Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 19/32] monitor: Rename use_io_thr to use_io_thread Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 20/32] monitor: Peel off @mon_global wrapper Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 21/32] qobject: New qdict_from_jsonf_nofail() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 22/32] qmp: De-duplicate error response building Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 23/32] qmp: Use QDict * instead of QObject * for response objects Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 24/32] qmp: Replace monitor_json_emitter{, raw}() by qmp_{queue, send}_response() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 25/32] qmp: Replace get_qmp_greeting() by qmp_greeting() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 26/32] qmp: Simplify monitor_qmp_respond() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 27/32] qmp: Add some comments around null responses Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 28/32] qmp: Switch timestamp_put() to qdict_from_jsonf_nofail() Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 29/32] qobject: Let qobject_from_jsonf() fail instead of abort Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 30/32] qmp: Clean up capability negotiation after commit 02130314d8c Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 31/32] monitor: Improve some comments Markus Armbruster
2018-07-03 15:37 ` [Qemu-devel] [PULL 32/32] qapi: Polish command flags documentation in qapi-code-gen.txt Markus Armbruster

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=20180703153728.2175-2-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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).