From patchwork Fri Apr 27 19:28:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 10369783 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3C908602DC for ; Fri, 27 Apr 2018 19:31:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C87F294C0 for ; Fri, 27 Apr 2018 19:31:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21555294C2; Fri, 27 Apr 2018 19:31:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B17AA294BC for ; Fri, 27 Apr 2018 19:31:44 +0000 (UTC) Received: from localhost ([::1]:49666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC95r-0007V4-TF for patchwork-qemu-devel@patchwork.kernel.org; Fri, 27 Apr 2018 15:31:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fC93V-00064p-3r for qemu-devel@nongnu.org; Fri, 27 Apr 2018 15:29:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fC93T-0000zs-V4 for qemu-devel@nongnu.org; Fri, 27 Apr 2018 15:29:17 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34474 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fC93T-0000zf-Pu for qemu-devel@nongnu.org; Fri, 27 Apr 2018 15:29:15 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 67E074276E3C for ; Fri, 27 Apr 2018 19:29:15 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-124-192.rdu2.redhat.com [10.10.124.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 491D0215CDCB; Fri, 27 Apr 2018 19:29:14 +0000 (UTC) From: Laszlo Ersek To: qemu-devel@nongnu.org Date: Fri, 27 Apr 2018 21:28:52 +0200 Message-Id: <20180427192852.15013-6-lersek@redhat.com> In-Reply-To: <20180427192852.15013-1-lersek@redhat.com> References: <20180427192852.15013-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 27 Apr 2018 19:29:15 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 27 Apr 2018 19:29:15 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v3 5/5] qapi: deprecate CpuInfoFast.arch X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The TARGET_BASE_ARCH values from "configure" don't all map to the @CpuInfoArch enum constants; in particular "s390x" from the former does not match @s390 in the latter. Clients are known to rely on the @s390 constant specifically, so we can't change it silently. Instead, deprecate the @CpuInfoFast.@arch member (in favor of @CpuInfoFast.@target) using the regular deprecation process. (No deprecation reminder is added to sysemu_target_to_cpuinfo_arch(): once @CpuInfoFast.@arch is removed, the assignment expression that calls sysemu_target_to_cpuinfo_arch() from qmp_query_cpus_fast() will have to disappear; in turn the static function left without callers will also break the build, thus it'll have to go.) Cc: "Daniel P. Berrange" Cc: Eric Blake Cc: Markus Armbruster Signed-off-by: Laszlo Ersek Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster --- Notes: PATCHv3: - new patch [Markus, Eric] qapi/misc.json | 8 ++++---- qemu-doc.texi | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/qapi/misc.json b/qapi/misc.json index fa4eec7b6b63..f5988cc0b52d 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -550,27 +550,27 @@ # Information about a virtual CPU # # @cpu-index: index of the virtual CPU # # @qom-path: path to the CPU object in the QOM tree # # @thread-id: ID of the underlying host thread # # @props: properties describing to which node/socket/core/thread # virtual CPU belongs to, provided if supported by board # -# @arch: base architecture of the cpu +# @arch: base architecture of the cpu; deprecated since 2.13.0 in favor +# of @target # -# @target: the QEMU system emulation target, which is more specific than -# @arch and determines which additional fields will be listed -# (since 2.13) +# @target: the QEMU system emulation target, which determines which +# additional fields will be listed (since 2.13) # # Since: 2.12 # ## { 'union' : 'CpuInfoFast', 'base' : { 'cpu-index' : 'int', 'qom-path' : 'str', 'thread-id' : 'int', '*props' : 'CpuInstanceProperties', 'arch' : 'CpuInfoArch', 'target' : 'SysEmuTarget' }, diff --git a/qemu-doc.texi b/qemu-doc.texi index 5813d276156a..0ed0f19e6bab 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2941,22 +2941,27 @@ by the ``convert -l snapshot_param'' argument instead. @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) "autoload" parameter is now ignored. All bitmaps are automatically loaded from qcow2 images. @subsection query-cpus (since 2.12.0) The ``query-cpus'' command is replaced by the ``query-cpus-fast'' command. +@subsection query-cpus-fast "arch" output member (since 2.13.0) + +The ``arch'' output member of the ``query-cpus-fast'' command is +replaced by the ``target'' output member. + @section System emulator devices @subsection ivshmem (since 2.6.0) The ``ivshmem'' device type is replaced by either the ``ivshmem-plain'' or ``ivshmem-doorbell`` device types. @subsection Page size support < 4k for embedded PowerPC CPUs (since 2.12.0) qemu-system-ppcemb will be removed. qemu-system-ppc (or qemu-system-ppc64) should be used instead. That means that embedded 4xx PowerPC CPUs will not