From nobody Fri Apr 26 07:02:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1596049878; cv=none; d=zohomail.com; s=zohoarc; b=Fy1ZA0w5ThjOO6wD290tpL2YXSHcvmlPOe7vQYP8TLaurx/6ye+ZElnP4tcPDh1yRJeggV/b7aUusFCO17ntRaAH9fUp2KOiLHGY2YydPUaPkuMXw3EsFkLsjNTygDX/TKPvfGJC/wWUl6InVBJ0S+qaZ/r061zeQOfIIHpgfSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596049878; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=bcorSBZXkBkW1mp/hqFvB6M1vX2DnTHEzjvxS98edmI=; b=XzvPAC0Tn6IjGKHPLM1RCoTM88jsaHNQAxlh7spy7qtt3+15fyBf/7Gdaiw5r1fnZdADyBBB7IVEVPYYZqvU53M7kAQWt2azxuScLz7lGHZdABGPgFcdJzAJjYJdxS4BBRzbIuyzaBZSuF3wHjt8FPcHNJlAOhl+FkiNoXMTMdQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596049877998362.285359713002; Wed, 29 Jul 2020 12:11:17 -0700 (PDT) Received: from localhost ([::1]:60594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0rTw-0005Ml-69 for importer@patchew.org; Wed, 29 Jul 2020 15:11:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0rT9-0004iN-1V for qemu-devel@nongnu.org; Wed, 29 Jul 2020 15:10:27 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:33230) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0rT6-0002eR-Pr for qemu-devel@nongnu.org; Wed, 29 Jul 2020 15:10:26 -0400 Received: by mail-wr1-x434.google.com with SMTP id f18so22665265wrs.0 for ; Wed, 29 Jul 2020 12:10:24 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t202sm6023473wmt.20.2020.07.29.12.10.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2020 12:10:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bcorSBZXkBkW1mp/hqFvB6M1vX2DnTHEzjvxS98edmI=; b=wlENyWeHgHiUB4DWUx43bNSL3Vl4iY2Rmg56cpb9dwy9I15o/ZFdjQdFkP0+f0b0lM JlRod+y7Gx5sUBKz+sUfcdnd4vUvBIo+P8ndaPlER2IkQWGayfmFNDnaa60PySGVEoav ClxLZ7B/6LQ7XMv+4EWGYhbCkflp3V0lmmwyxeXAs9RmyBH2dBNAQK83yXPFSEc25gA9 ElhexjnZC+3283yw7Zb85fU7vTcnQOiK4pu80cjIxy7V9cQWBfTMRp4j6wWxzOzEGzbN aFwD1vvk2opc+f9H7BkwoUPsQkK3yCdVwIU48/78SJyLONHIoC89ukz8D5sPuMo7L5cj 48sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bcorSBZXkBkW1mp/hqFvB6M1vX2DnTHEzjvxS98edmI=; b=oJ7GShg/QzXl1MK04AbOkG9Z+VxSh3bCuwYZpO0s9bS6+PYf6QFgn8oCDSixOY2i1T snQMx1fmmeAc/3fFN9JKNFOWU8ZMHR/A0Ob/Tpw6hxX7GpKruWqJZyzE/EflrwSI1aM/ amLOoTytGNscyiUTf8fGIZybrETKmnWlybzUnFEh6c0oPbwc/mUqEiA3G7wpS3V5tlA0 QxHWVmC4B8LYiunPfvZ2LphqkPR7ZM9YePZPPoVHUd3qoPtrvW/3aDFRaV1QQtPGcxDO CfLedf1PgzK3HPxqAqUMQT/Re3lyFErIRcQh+qM/i1QXP1wgl9xKXU7HwDG9UXx2NDEu EW2g== X-Gm-Message-State: AOAM533TQjx8fGZQUjLWYo1CXDs72hR3Ixu2yDHYOSTydLJNzBmJdCE5 MHJNYw36YFHQRyf/A8NarZiHwilrCe4jWg== X-Google-Smtp-Source: ABdhPJyqdHt4BtNmQkn0cKztOaFpyCIMlRGBIaqfczgWn+6l5Pg0pUIcXlVC1fgC7necV2hHosU+Zg== X-Received: by 2002:a5d:6b08:: with SMTP id v8mr31851747wrw.2.1596049822252; Wed, 29 Jul 2020 12:10:22 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH for-5.1] qapi/machine.json: Fix missing newline in doc comment Date: Wed, 29 Jul 2020 20:10:19 +0100 Message-Id: <20200729191019.19168-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" In commit 176d2cda0dee9f4 we added the @die-id field to the CpuInstanceProperties struct, but in the process accidentally removed the newline between the doc-comment lines for @core-id and @thread-id. Put the newline back in; this fixes a misformatting in the generated HTML QMP reference manual. Signed-off-by: Peter Maydell Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Not very important but I've suggested for-5.1 as it's a safe docs fix. You can see the misrendered doc at https://www.qemu.org/docs/master/interop/qemu-qmp-ref.html#index-CpuInstanc= eProperties qapi/machine.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qapi/machine.json b/qapi/machine.json index f59144023ca..daede5ab149 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -825,7 +825,8 @@ # @node-id: NUMA node ID the CPU belongs to # @socket-id: socket number within node/board the CPU belongs to # @die-id: die number within node/board the CPU belongs to (Since 4.1) -# @core-id: core number within die the CPU belongs to# @thread-id: thread = number within core the CPU belongs to +# @core-id: core number within die the CPU belongs to +# @thread-id: thread number within core the CPU belongs to # # Note: currently there are 5 properties that could be present # but management should be prepared to pass through other --=20 2.20.1