From patchwork Mon May 15 16:22:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 681991 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8f:0:0:0:0:0 with SMTP id d15csp1204623wrr; Mon, 15 May 2023 09:23:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7xkn1qK6Bp6uSCrrbzqnm5FVq7jdYQNC4+ITUb5R9FrtpN2dnpfabhDClmSi7wxijliBkP X-Received: by 2002:a05:6214:19ef:b0:61b:79ab:7129 with SMTP id q15-20020a05621419ef00b0061b79ab7129mr54336678qvc.37.1684167836185; Mon, 15 May 2023 09:23:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684167836; cv=none; d=google.com; s=arc-20160816; b=ykGgyIkPPofP1BvsNfAVs/GiddS34H7SEMZ9+qf9F9hiCgZXRpiayquLhmccRzstF6 bOLILWjbQzP+mTXyq7Lv8/HgZ7XViKcfiw8mT5bl0am53OYE63sY/NnKb2705gkdaXtw ZEpouXdmw6XbPrQgf/nSGaRAscV80x87Mnz5n6pK2mG7+xpLTDSotvJ83fEivEJr6UPY Okk7aOQu+erfs9oFntAYyjrqIc71JD+JhGTyynTiCQQUv0hJoUnfg3HnllJNyM54CQV8 ErGFOJPdheq2EoRjk05/kAs9ZkWxyOSfQxspb1p1xfcxPp+8oxmGg8DtMkeJKrPYRhqG 0i4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=l10MjSHz1E+vOlw/u/G09LRDhrQUH8Om/xwnB3b6ut0=; b=xHWnNeNSxS/PSkevVU2LYfJPSbFZYwojCBlE3VC0LA80ydjLoPyoXEIU8QRjnvhCa2 2dTxUDR6N0hGst7B0wZOiF3+07lVuX0O2NRQeDkH/XTEdLf39IxpfddYHz1dVcGAyHnQ 9k+qJB7e0Y62gcyQ6er94ZG84n9bsN9aSdViv172JKqGKDkEJ2mSw3MyXcqoUJmBjcwc P0GfojngTBEgqBzPeEoI+cUEWJqa7dPqztS+nR5U9gG/E4Nm1sKw6ormx7mdV01iJZ/f s/vv8Y08HyUQDYEECIPIClJ1BD+JTHFuvIxBjWQy8Mnph5I0OYwUI2lCqLaZOAkdcM0N Uu6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="sYgSS/W1"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 13-20020a0562140dcd00b005e16410c364si10391431qvt.355.2023.05.15.09.23.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 May 2023 09:23:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="sYgSS/W1"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pyayY-0001MM-AU; Mon, 15 May 2023 12:23:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pyayM-0001Fn-99 for qemu-devel@nongnu.org; Mon, 15 May 2023 12:22:56 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pyayK-0005Mz-30 for qemu-devel@nongnu.org; Mon, 15 May 2023 12:22:54 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3078cc99232so9720223f8f.3 for ; Mon, 15 May 2023 09:22:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684167768; x=1686759768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l10MjSHz1E+vOlw/u/G09LRDhrQUH8Om/xwnB3b6ut0=; b=sYgSS/W1casWGu692hV8A8Neqtlcyua+c7lB8gvje7at0sMMkYbljJtt/2eENy6Gb0 +ChB2/EmQgirOLG05CBkudzuloxWxPFelDyxdds1Hch8l/buYuPXIyQb/jxnWQjPshx2 DegTq+E0jQjAR9URkr5W0gjW9AqW3J57Bsu8inAZwE41z4Bx2OF6FpUEmHyQ85Z6oMU2 VHfjCq5g5S1KWKt+jsQVGVZGXh7+dQos7ARPCsRkr0KVE4vGAItk5xtR3Bvqj5fSTrTN vObTvoXOZkMZLaj3qSnXUONfpWPnUzsckJHthG2j+Yx1Da3SRjhCJOxarfVDSIJdnsT4 H/fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684167768; x=1686759768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l10MjSHz1E+vOlw/u/G09LRDhrQUH8Om/xwnB3b6ut0=; b=g1Qmwrz32IZNSMSWDWH6e5PuUC71eO0USpGw+hghdOivD61Zv3EOk4jmWkAurK4PX8 ovDM7SqNLsvHngJrYcYE7Gs3EpacGd39mjGQNLAjr9KnQnVgaSNjDWC40oFCIgVyqzyf ezUcWRgYyhYMkj0L9G909qZFMpP2cvzUipyED1GVYOVpnGwMhU50ZhGVjJchCpL1V5mE r2EMFt42nd0YXXRVYgMflLC9UUmWSnwFio0+fCZJaEGxtpZX++GX+Cb2CH9SI13xljF5 oZr6SuGCwgZhGc+dvkSO+l4sexOzUHtVkOWr6pqYINQ3JsOa5oPLaNcXFvEhREFPuyBz oDmA== X-Gm-Message-State: AC+VfDy9aQTqitXD1YDGWI7tvEz2nhn+xyiSQa7Fd/a4sItcef5JwusN oLBSYNOUOs9bUFh+TTAfSmEX1Q6n+mwRswm4cXU= X-Received: by 2002:a5d:4685:0:b0:306:4063:1afe with SMTP id u5-20020a5d4685000000b0030640631afemr28940908wrq.71.1684167768442; Mon, 15 May 2023 09:22:48 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id h12-20020adffd4c000000b003063176ef09sm278203wrs.6.2023.05.15.09.22.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 May 2023 09:22:48 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Cc: Markus Armbruster , Eric Blake Subject: [PATCH v3 3/3] docs/interop: Delete qmp-intro.txt Date: Mon, 15 May 2023 17:22:45 +0100 Message-Id: <20230515162245.3964307-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230515162245.3964307-1-peter.maydell@linaro.org> References: <20230515162245.3964307-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org qmp-intro.txt is quite small and provides very little information that isn't already in the documentation elsewhere. Fold the example command lines into qemu-options.hx, and delete the now-unneeded plain text document. While we're touching the qemu-options.hx documentation text, wordsmith it a little bit and improve the rST formatting. Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster Signed-off-by: Peter Maydell --- docs/interop/qmp-intro.txt | 88 -------------------------------------- qemu-options.hx | 28 +++++++++--- 2 files changed, 22 insertions(+), 94 deletions(-) delete mode 100644 docs/interop/qmp-intro.txt diff --git a/docs/interop/qmp-intro.txt b/docs/interop/qmp-intro.txt deleted file mode 100644 index 1c745a7af04..00000000000 --- a/docs/interop/qmp-intro.txt +++ /dev/null @@ -1,88 +0,0 @@ - QEMU Machine Protocol - ===================== - -Introduction ------------- - -The QEMU Machine Protocol (QMP) allows applications to operate a -QEMU instance. - -QMP is JSON[1] based and features the following: - -- Lightweight, text-based, easy to parse data format -- Asynchronous messages support (ie. events) -- Capabilities Negotiation - -For detailed information on QMP's usage, please, refer to the following files: - -o qmp-spec.txt QEMU Machine Protocol current specification -o qemu-qmp-ref.html QEMU QMP commands and events (auto-generated at build-time) - -[1] https://www.json.org - -Usage ------ - -You can use the -qmp option to enable QMP. For example, the following -makes QMP available on localhost port 4444: - -$ qemu [...] -qmp tcp:localhost:4444,server=on,wait=off - -However, for more flexibility and to make use of more options, the -mon -command-line option should be used. For instance, the following example -creates one HMP instance (human monitor) on stdio and one QMP instance -on localhost port 4444: - -$ qemu [...] -chardev stdio,id=mon0 -mon chardev=mon0,mode=readline \ - -chardev socket,id=mon1,host=localhost,port=4444,server=on,wait=off \ - -mon chardev=mon1,mode=control,pretty=on - -Please, refer to QEMU's manpage for more information. - -Simple Testing --------------- - -To manually test QMP one can connect with telnet and issue commands by hand: - -$ telnet localhost 4444 -Trying 127.0.0.1... -Connected to localhost. -Escape character is '^]'. -{ - "QMP": { - "version": { - "qemu": { - "micro": 0, - "minor": 0, - "major": 3 - }, - "package": "v3.0.0" - }, - "capabilities": [ - "oob" - ] - } -} - -{ "execute": "qmp_capabilities" } -{ - "return": { - } -} - -{ "execute": "query-status" } -{ - "return": { - "status": "prelaunch", - "singlestep": false, - "running": false - } -} - -Please refer to docs/interop/qemu-qmp-ref.* for a complete command -reference, generated from qapi/qapi-schema.json. - -QMP wiki page -------------- - -https://wiki.qemu.org/QMP diff --git a/qemu-options.hx b/qemu-options.hx index 42b9094c10f..920f9640155 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4170,26 +4170,42 @@ DEF("qmp", HAS_ARG, QEMU_OPTION_qmp, \ QEMU_ARCH_ALL) SRST ``-qmp dev`` - Like -monitor but opens in 'control' mode. + Like ``-monitor`` but opens in 'control' mode. For example, to make + QMP available on localhost port 4444:: + + -qmp tcp:localhost:4444,server=on,wait=off + + Not all options are configurable via this syntax; for maximum + flexibility use the ``-mon`` option and an accompanying ``-chardev``. + ERST DEF("qmp-pretty", HAS_ARG, QEMU_OPTION_qmp_pretty, \ "-qmp-pretty dev like -qmp but uses pretty JSON formatting\n", QEMU_ARCH_ALL) SRST ``-qmp-pretty dev`` - Like -qmp but uses pretty JSON formatting. + Like ``-qmp`` but uses pretty JSON formatting. ERST DEF("mon", HAS_ARG, QEMU_OPTION_mon, \ "-mon [chardev=]name[,mode=readline|control][,pretty[=on|off]]\n", QEMU_ARCH_ALL) SRST ``-mon [chardev=]name[,mode=readline|control][,pretty[=on|off]]`` - Setup monitor on chardev name. ``mode=control`` configures - a QMP monitor (a JSON RPC-style protocol) and it is not the - same as HMP, the human monitor that has a "(qemu)" prompt. - ``pretty`` is only valid when ``mode=control``, + Set up a monitor connected to the chardev ``name``. + QEMU supports two monitors: the Human Monitor Protocol + (HMP; for human interaction), and the QEMU Monitor Protocol + (QMP; a JSON RPC-style protocol). + The default is HMP; ``mode=control`` selects QMP instead. + ``pretty`` is only valid when ``mode=control``, turning on JSON pretty printing to ease human reading and debugging. + + For example:: + + -chardev socket,id=mon1,host=localhost,port=4444,server=on,wait=off \ + -mon chardev=mon1,mode=control,pretty=on + + enables the QMP monitor on localhost port 4444 with pretty-printing. ERST DEF("debugcon", HAS_ARG, QEMU_OPTION_debugcon, \