From patchwork Mon Aug 3 09:10:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 247362 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp1041939ilo; Mon, 3 Aug 2020 02:13:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyZxgrsZpoHbrOm88wB+yPUxmQ2YIzqh3Abmyj9hhjH3pnhDsLxj329G8GXPrZdoWcOBPV X-Received: by 2002:a5b:d0a:: with SMTP id y10mr6574010ybp.128.1596446022481; Mon, 03 Aug 2020 02:13:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596446022; cv=none; d=google.com; s=arc-20160816; b=Rz7lEFnOTZLt+sExVrNwNnX4NrIpGgK4TGQJA2YeWndgb+laYWTwk7LJ1JkyBeHWn1 SyetN4ZFVsfjZeoSDfLoIVjdwqANEzZjLjZxJFN0tqA8v9SPTGc5iimh25tJT66A1nMf eeHpK7ozVBgcrjVYPL/vanFPDi6ZJ0SovtwkA/D0dLu3YAWNoTnOH2YwWXUN/ByaTK03 wDa9/oZu8A1BcNsIn5M9GXT5sx7DmLBkF6pY+exjn6fKyEfz17fHz9+vK8m8bL18FE3L adSwtEA8FL2Q8GUaTCY88uKO61MstGfP46szvjLc+dVdtixrDKjRONxyB1Ji1ZDTjhOr vFWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=wtnr2H4Of/V470GKi1MzOiFj9IlFWITEKpHRVULWbmU=; b=PrMO3EvZkxlp0Mf4P1nV+ry6kJEGH7JYHs+RE7tzB/MYOhKR24SEefTv8f2r/Qunbc L4Bz0kicBhS+XhzlTR7Jx5lhVcfnUdDJqaxwwOoqXLNdMsz144hPWfwGZdYhkuFyfx8u rll+HzCt/oz8EzgEHmcS0+q7mUOsE8WykIIuL0SzafLnNtF043Gn8NsrX8oxKimI/DLE Ja0zaN/JOI+aRuOCeT/xWtT3HiUAepBsQn5SqqkWhafYuQ+MAKZ0xpqqZjJhey0SR97t guA/oglSgYpC+zXdYHnx5/E1t8xE6mJ6+t2+6SbX0aSx1S9lLc/Jl9P4iQ+Nc0GJ95ac QEFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=ZguPHPAx; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c2si13764410ybn.183.2020.08.03.02.13.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Aug 2020 02:13:42 -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=fail header.i=@redhat.com header.s=mimecast20190719 header.b=ZguPHPAx; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:37704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2WXN-0008Q6-VO for patch@linaro.org; Mon, 03 Aug 2020 05:13:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2WUe-0005gY-BJ for qemu-devel@nongnu.org; Mon, 03 Aug 2020 05:10:52 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51244 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k2WUc-0003sC-GH for qemu-devel@nongnu.org; Mon, 03 Aug 2020 05:10:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596445849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wtnr2H4Of/V470GKi1MzOiFj9IlFWITEKpHRVULWbmU=; b=ZguPHPAxdV4C0+dgp4detCs10FmB/DxQCjWwsWsDu9vSUDcmjy6Ooz2914YVu1xAuGas4r Q139fEuJrOEb9Z+UKbGlv8vlEYtZnLJrBi3FYPL6IcEU+WtKU7ELA3UEIlRvMSPbPz/7Ov BXWtgdC+rW1Yc1CxaZ4Ud/NrrNswUAc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-382-t29u3lwmNf2VVjtY76rygA-1; Mon, 03 Aug 2020 05:10:45 -0400 X-MC-Unique: t29u3lwmNf2VVjtY76rygA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 430B919057A1; Mon, 3 Aug 2020 09:10:44 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 150AE7B41F; Mon, 3 Aug 2020 09:10:44 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9E5F81132921; Mon, 3 Aug 2020 11:10:42 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 1/3] qapi/machine.json: Fix missing newline in doc comment Date: Mon, 3 Aug 2020 11:10:40 +0200 Message-Id: <20200803091042.2920218-2-armbru@redhat.com> In-Reply-To: <20200803091042.2920218-1-armbru@redhat.com> References: <20200803091042.2920218-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/03 01:24:44 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell 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 Message-Id: <20200729191019.19168-1-peter.maydell@linaro.org> Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Markus Armbruster --- qapi/machine.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.26.2 diff --git a/qapi/machine.json b/qapi/machine.json index f59144023c..daede5ab14 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