Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1850801/?format=api
{ "id": 1850801, "url": "http://patchwork.ozlabs.org/api/patches/1850801/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20231018130716.286638-11-thuth@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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-11-thuth@redhat.com>", "list_archive_url": null, "date": "2023-10-18T13:07:01", "name": "[PULL,10/25] machine: adding s390 topology to query-cpu-fast", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "54300f7329c50f4a5c60d4d62977d9e6f5835100", "submitter": { "id": 66152, "url": "http://patchwork.ozlabs.org/api/people/66152/?format=api", "name": "Thomas Huth", "email": "thuth@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20231018130716.286638-11-thuth@redhat.com/mbox/", "series": [ { "id": 378180, "url": "http://patchwork.ozlabs.org/api/series/378180/?format=api", "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/1850801/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1850801/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=h8IsjS0w;\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 4S9WQG3TLtz20Zj\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 19 Oct 2023 00:09:10 +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 1qt6H2-0004Cy-79; Wed, 18 Oct 2023 09:07:44 -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 1qt6H0-0004CD-6f\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:07:42 -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 1qt6Gy-0007xt-LO\n for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:07:41 -0400", "from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])\n by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-347-RK3YWCQNMP2JHA8IYZdtxQ-1; Wed, 18 Oct 2023 09:07:36 -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 304F01DD35CA;\n Wed, 18 Oct 2023 13:07:36 +0000 (UTC)", "from thuth-p1g4.redhat.com (unknown [10.39.192.109])\n by smtp.corp.redhat.com (Postfix) with ESMTP id A3D3520268C8;\n Wed, 18 Oct 2023 13:07:34 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1697634459;\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=Nt8FnL5/ofazqAvViAcI8m5iQGHQh0F8aBouRe2mRDQ=;\n b=h8IsjS0wdDKR/0YJddTSgT1nZf3SU4ys4XxXBpoTOOLWpe0YTQs5cMmDY202UhRgg/DmT8\n YGvWCOAxLEm/vmyif6bcmec7ahnwMv1FLh4qA138+sh8bP/nAuqs2sX2IYYoHYcD9OWxPD\n 807wmBXaCGQyhsQPXMjlgzVgiBtcDTE=", "X-MC-Unique": "RK3YWCQNMP2JHA8IYZdtxQ-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 10/25] machine: adding s390 topology to query-cpu-fast", "Date": "Wed, 18 Oct 2023 15:07:01 +0200", "Message-ID": "<20231018130716.286638-11-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: Pierre Morel <pmorel@linux.ibm.com>\n\nS390x provides two more topology attributes, entitlement and dedication.\n\nLet's add these CPU attributes to the QAPI command query-cpu-fast.\n\nSigned-off-by: Pierre Morel <pmorel@linux.ibm.com>\nReviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>\nCo-developed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>\nReviewed-by: Thomas Huth <thuth@redhat.com>\nAcked-by: Markus Armbruster <armbru@redhat.com>\nSigned-off-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>\nMessage-ID: <20231016183925.2384704-11-nsg@linux.ibm.com>\nSigned-off-by: Thomas Huth <thuth@redhat.com>\n---\n qapi/machine.json | 9 ++++++++-\n target/s390x/cpu.c | 9 +++++++++\n 2 files changed, 17 insertions(+), 1 deletion(-)", "diff": "diff --git a/qapi/machine.json b/qapi/machine.json\nindex 17b69a6aea..b4bd26f716 100644\n--- a/qapi/machine.json\n+++ b/qapi/machine.json\n@@ -57,9 +57,16 @@\n #\n # @cpu-state: the virtual CPU's state\n #\n+# @dedicated: the virtual CPU's dedication (since 8.2)\n+#\n+# @entitlement: the virtual CPU's entitlement (since 8.2)\n+#\n # Since: 2.12\n ##\n-{ 'struct': 'CpuInfoS390', 'data': { 'cpu-state': 'CpuS390State' } }\n+{ 'struct': 'CpuInfoS390',\n+ 'data': { 'cpu-state': 'CpuS390State',\n+ '*dedicated': 'bool',\n+ '*entitlement': 'CpuS390Entitlement' } }\n \n ##\n # @CpuInfoFast:\ndiff --git a/target/s390x/cpu.c b/target/s390x/cpu.c\nindex ba646461a1..6acfa1c91b 100644\n--- a/target/s390x/cpu.c\n+++ b/target/s390x/cpu.c\n@@ -38,6 +38,7 @@\n #ifndef CONFIG_USER_ONLY\n #include \"sysemu/reset.h\"\n #endif\n+#include \"hw/s390x/cpu-topology.h\"\n \n #define CR0_RESET 0xE0UL\n #define CR14_RESET 0xC2000000UL;\n@@ -146,6 +147,14 @@ static void s390_query_cpu_fast(CPUState *cpu, CpuInfoFast *value)\n S390CPU *s390_cpu = S390_CPU(cpu);\n \n value->u.s390x.cpu_state = s390_cpu->env.cpu_state;\n+#if !defined(CONFIG_USER_ONLY)\n+ if (s390_has_topology()) {\n+ value->u.s390x.has_dedicated = true;\n+ value->u.s390x.dedicated = s390_cpu->env.dedicated;\n+ value->u.s390x.has_entitlement = true;\n+ value->u.s390x.entitlement = s390_cpu->env.entitlement;\n+ }\n+#endif\n }\n \n /* S390CPUClass::reset() */\n", "prefixes": [ "PULL", "10/25" ] }