{"id":1850795,"url":"http://patchwork.ozlabs.org/api/patches/1850795/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20231018130716.286638-2-thuth@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20231018130716.286638-2-thuth@redhat.com>","list_archive_url":null,"date":"2023-10-18T13:06:52","name":"[PULL,01/25] qapi: machine.json: change docs regarding CPU topology","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"30e9257edbca7bd35dfa22df4d72e1802a94e2fe","submitter":{"id":66152,"url":"http://patchwork.ozlabs.org/api/people/66152/?format=json","name":"Thomas Huth","email":"thuth@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20231018130716.286638-2-thuth@redhat.com/mbox/","series":[{"id":378180,"url":"http://patchwork.ozlabs.org/api/series/378180/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=378180","date":"2023-10-18T13:06:52","name":"[PULL,01/25] qapi: machine.json: change docs regarding CPU topology","version":1,"mbox":"http://patchwork.ozlabs.org/series/378180/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1850795/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1850795/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=QILq7ni4;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4S9WNV0NkYz20Zj\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 19 Oct 2023 00:07:38 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1qt6Gn-0003tP-Ie; Wed, 18 Oct 2023 09:07:29 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <thuth@redhat.com>) id 1qt6Gk-0003nR-DR\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:07:26 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <thuth@redhat.com>) id 1qt6Gi-0007pm-IZ\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:07:26 -0400","from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-223-ReLYJGIhPjenUGdt-7uSXw-1; Wed, 18 Oct 2023 09:07:20 -0400","from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com\n [10.11.54.4])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 518A8882398;\n Wed, 18 Oct 2023 13:07:20 +0000 (UTC)","from thuth-p1g4.redhat.com (unknown [10.39.192.109])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 5EE3020268C8;\n Wed, 18 Oct 2023 13:07:19 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1697634442;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=ZDpdfHt4mpsWTeEd+aXvHudq/DJQuDCQERgF2B0hWJc=;\n b=QILq7ni4kDDQSTGwQC3t1qrm6/wJd5v1pw9OWHPnGSroRVFP1Jxy1Yg7K2G59m4/h2nMI4\n DjWCX9E9o8wDtAGdFs7I/1jLE61VQ7qSvffJmH0VozldR9+OIdnxdj1BZsFRnHKq71DHl/\n TpE1uAZDxEEUAHg7R5ry8eph7rj/F+M=","X-MC-Unique":"ReLYJGIhPjenUGdt-7uSXw-1","From":"Thomas Huth <thuth@redhat.com>","To":"qemu-devel@nongnu.org","Cc":"Stefan Hajnoczi <stefanha@redhat.com>, qemu-s390x@nongnu.org,\n Nina Schoetterl-Glausch <nsg@linux.ibm.com>","Subject":"[PULL 01/25] qapi: machine.json: change docs regarding CPU topology","Date":"Wed, 18 Oct 2023 15:06:52 +0200","Message-ID":"<20231018130716.286638-2-thuth@redhat.com>","In-Reply-To":"<20231018130716.286638-1-thuth@redhat.com>","References":"<20231018130716.286638-1-thuth@redhat.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.4.1 on 10.11.54.4","Received-SPF":"pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com;\n helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Nina Schoetterl-Glausch <nsg@linux.ibm.com>\n\nClarify roles of different architectures.\nAlso change things a bit in anticipation of additional members being\nadded.\n\nSuggested-by: Markus Armbruster <armbru@redhat.com>\nSigned-off-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>\nMessage-ID: <20231016183925.2384704-2-nsg@linux.ibm.com>\nAcked-by: Markus Armbruster <armbru@redhat.com>\n[thuth: Updated some comments according to suggestions from Markus]\nSigned-off-by: Thomas Huth <thuth@redhat.com>\n---\n qapi/machine.json | 59 ++++++++++++++++++++++++++++++-----------------\n 1 file changed, 38 insertions(+), 21 deletions(-)","diff":"diff --git a/qapi/machine.json b/qapi/machine.json\nindex a08b6576ca..f053245756 100644\n--- a/qapi/machine.json\n+++ b/qapi/machine.json\n@@ -71,8 +71,7 @@\n #\n # @thread-id: ID of the underlying host thread\n #\n-# @props: properties describing to which node/socket/core/thread\n-#     virtual CPU belongs to, provided if supported by board\n+# @props: properties associated with a virtual CPU, e.g. the socket id\n #\n # @target: the QEMU system emulation target, which determines which\n #     additional fields will be listed (since 3.0)\n@@ -899,28 +898,35 @@\n # should be passed by management with device_add command when a CPU is\n # being hotplugged.\n #\n+# Which members are optional and which mandatory depends on the\n+# architecture and board.\n+#\n+# The ids other than the node-id specify the position of the CPU\n+# within the CPU topology (as defined by the machine property \"smp\",\n+# thus see also type @SMPConfiguration)\n+#\n # @node-id: NUMA node ID the CPU belongs to\n #\n-# @socket-id: socket number within node/board the CPU belongs to\n+# @socket-id: socket number within CPU topology the CPU belongs to\n #\n-# @die-id: die number within socket the CPU belongs to (since 4.1)\n+# @die-id: die number within the parent container the CPU belongs to\n+#    (since 4.1)\n #\n-# @cluster-id: cluster number within die the CPU belongs to (since\n-#     7.1)\n+# @cluster-id: cluster number within the parent container the CPU\n+#     belongs to (since 7.1)\n #\n-# @core-id: core number within cluster the CPU belongs to\n+# @core-id: core number within the parent container the CPU\n+#     belongs to\n #\n-# @thread-id: thread number within core the CPU belongs to\n+# @thread-id: thread number within the core the CPU  belongs to\n #\n-# Note: currently there are 6 properties that could be present but\n-#     management should be prepared to pass through other properties\n-#     with device_add command to allow for future interface extension.\n-#     This also requires the filed names to be kept in sync with the\n-#     properties passed to -device/device_add.\n+# Note: management should be prepared to pass through additional\n+#     properties with device_add.\n #\n # Since: 2.7\n ##\n { 'struct': 'CpuInstanceProperties',\n+  # Keep these in sync with the properties device_add accepts\n   'data': { '*node-id': 'int',\n             '*socket-id': 'int',\n             '*die-id': 'int',\n@@ -1478,22 +1484,33 @@\n # Schema for CPU topology configuration.  A missing value lets QEMU\n # figure out a suitable value based on the ones that are provided.\n #\n-# @cpus: number of virtual CPUs in the virtual machine\n-#\n-# @sockets: number of sockets in the CPU topology\n+# The members other than @cpus and @maxcpus define a topology of\n+# containers.\n #\n-# @dies: number of dies per socket in the CPU topology\n+# The ordering from highest/coarsest to lowest/finest is:\n+# @sockets, @dies, @clusters, @cores, @threads.\n #\n-# @clusters: number of clusters per die in the CPU topology (since\n-#     7.0)\n+# Different architectures support different subsets of topology\n+# containers.\n #\n-# @cores: number of cores per cluster in the CPU topology\n+# For example, s390x does not have clusters and dies, and the socket\n+# is the parent container of cores.\n #\n-# @threads: number of threads per core in the CPU topology\n+# @cpus: number of virtual CPUs in the virtual machine\n #\n # @maxcpus: maximum number of hotpluggable virtual CPUs in the virtual\n #     machine\n #\n+# @sockets: number of sockets in the CPU topology\n+#\n+# @dies: number of dies per parent container\n+#\n+# @clusters: number of clusters per parent container (since 7.0)\n+#\n+# @cores: number of cores per parent container\n+#\n+# @threads: number of threads per core\n+#\n # Since: 6.1\n ##\n { 'struct': 'SMPConfiguration', 'data': {\n","prefixes":["PULL","01/25"]}