From patchwork Fri May 26 16:53:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 685928 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1025213wrt; Fri, 26 May 2023 09:54:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4N5ma858tBZsLhB6pOYbDfDT99m6JjMzJMr1GmpXiaa07G4lFhXwwqz4malo07u7JWbGsJ X-Received: by 2002:a05:6214:400e:b0:616:859a:471a with SMTP id kd14-20020a056214400e00b00616859a471amr4807511qvb.17.1685120062736; Fri, 26 May 2023 09:54:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685120062; cv=none; d=google.com; s=arc-20160816; b=pRQZ1gv7pzLRvU7oK1ju2ON5qGRG5D1pZH7Qa0CGHTLz6SzbORa9T8A1Uk4b7Dlu0l /vsZkSlqg0htskClslwfiPVljCY4i8MPvWNsJN8xo2/5VkV55GcvpNQ7BkjpntbThm5S sf8TAWY+KdBN5GOjishoOCdlKc8jYSXZ9R3HPg65wdiD/SwWIGU4RndZ/0OpwakTa3Z/ cYx+jqeRcS0hFic/JjH4zylcFkfgLeyJO7fqj0SecUJA4vRXcZbOYIvk22RZsVn6bnBD Mp1SfY5TIfggb9eeMciym/Mz9MJB+SglTyY9gn2Q9G2Ah9V3qSIoZAQMBUyDcDPlhndm 9EJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:sender:errors-to:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:delivered-to:delivered-to:dkim-signature; bh=hQ4C0OH2eXL3stB8nBityndanYvrzr6EMyO8JmAb43Q=; b=xesPWKy3hAzj693VVOZ7ZoHI1hOm3EI36x+jcSpwPViaAigymx9bZrWrhzd4Qm/y+h 18yul6AKs1Q//byqiNqDlo7mrAww1tDyYSQKRoexv6Wo7rbK3/blFZ4ey7RzJTG8xCe5 +AMowPQAd/b17dXEtXaTjGccmNXUiEsSmB7LHIoR6iItt7UgQUW7Y48E1g0ifDsKmfvP BNFKGkuw/j774VfNPYQtWCs/DqouowNBTP98KWSMswazTQn1baOjuC9Lu1Sj+TrOYprf Hx6yxLoQYzU6JmG2aNGxa55eLUOVzUfxOci+Eh77zOkcxLQ1SxROGfU22h9P0PGjdqjj H57A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dfQgn282; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [170.10.133.124]) by mx.google.com with ESMTPS id jv6-20020a05621429e600b005ef8c578589si1548501qvb.297.2023.05.26.09.54.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:54:22 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dfQgn282; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685120062; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=hQ4C0OH2eXL3stB8nBityndanYvrzr6EMyO8JmAb43Q=; b=dfQgn2822UOOk6TkdShQnyTYpoFUeFNz2KzSTFjs0EKwC2fwzTiSIqVf0659BZGdIS6H9M UKods/w+a4apyUMeyKd/j5kcRi/65uVKww9lP4JFAYtGihArlgDyTZDaQNWcvps5PXK9zu 4Wq9WfNT2rNOnfdiBiKsYdTicxf2U1c= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-94-yn-mVDWeMziCCAsbKky0BA-1; Fri, 26 May 2023 12:54:17 -0400 X-MC-Unique: yn-mVDWeMziCCAsbKky0BA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B5811185A7A7; Fri, 26 May 2023 16:54:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A20BD492B0A; Fri, 26 May 2023 16:54:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 93A2B19465A4; Fri, 26 May 2023 16:54:11 +0000 (UTC) X-Original-To: libvir-list@listman.corp.redhat.com Delivered-To: libvir-list@listman.corp.redhat.com Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 15E3A19465B7 for ; Fri, 26 May 2023 16:54:09 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E9858492B0B; Fri, 26 May 2023 16:54:08 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E1985492B0A for ; Fri, 26 May 2023 16:54:08 +0000 (UTC) Received: from us-smtp-inbound-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C6E7B101A52C for ; Fri, 26 May 2023 16:54:08 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-606-_aoNqsATPhCF-5Xo8zaOyw-1; Fri, 26 May 2023 12:54:07 -0400 X-MC-Unique: _aoNqsATPhCF-5Xo8zaOyw-1 Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-30959c0dfd6so868657f8f.3 for ; Fri, 26 May 2023 09:54:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685120046; x=1687712046; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hQ4C0OH2eXL3stB8nBityndanYvrzr6EMyO8JmAb43Q=; b=IqhmlyXs5iZn+qJn+cy6kn86wuPz/DiB42zv0tChNnN4Bq/jh3ymYuY/ianOIRVgLu F3cnKxk0JIeXkfaC2bXrVZPPWo4q+g2dkoF1qt5Za2pVK7ZQeGoPI39LDd3vX9DJYOdr Ddok0ZNrR1mC3sy0ovUOukuvJbqyRkRi17NC/vgoZD77bqzH9Sb3BkO8X3XYW4TfM45g cciIo7Isc3xuNAIaYeU5okqAU6ahlI8uY6Zkeyh+BNj+s13G5ZsOLf0FWaSKxLeViozi I3KHg6hYjljzkzIQCH4NkbPKE3q9ncpepIPS8QBkVWCTVfQZqVG0nTA6MkF4IGN7+Bh1 HM/w== X-Gm-Message-State: AC+VfDxCtCvr6Vd9jGrFQhoI6to16YwO/YQ+a8qqnk50mj/DFqTtay2D FD42M3z2PI0mNeu7gDpD4sxz1w== X-Received: by 2002:adf:f604:0:b0:30a:9043:8f1d with SMTP id t4-20020adff604000000b0030a90438f1dmr1570311wrp.5.1685120045787; Fri, 26 May 2023 09:54:05 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id g14-20020a5d540e000000b00307a86a4bcesm5659872wrv.35.2023.05.26.09.54.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 May 2023 09:54:05 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C8C651FFBF; Fri, 26 May 2023 17:54:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [PATCH v6 06/11] qapi: make the vcpu parameters deprecated for 8.1 Date: Fri, 26 May 2023 17:53:56 +0100 Message-Id: <20230526165401.574474-7-alex.bennee@linaro.org> In-Reply-To: <20230526165401.574474-1-alex.bennee@linaro.org> References: <20230526165401.574474-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , libvir-list@redhat.com, Kyle Evans , Riku Voipio , Richard Henderson , Markus Armbruster , Greg Kurz , Yanan Wang , Marcel Apfelbaum , Michael Roth , Paolo Bonzini , Christian Schoenebeck , Eric Blake , Warner Losh Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: linaro.org I don't think I can remove the parameters directly but certainly mark them as deprecated. Reviewed-by: Stefan Hajnoczi Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20230524133952.3971948-6-alex.bennee@linaro.org> --- v6 - s/QAPI/QMP/ - /and always false./and always ignored./ --- docs/about/deprecated.rst | 7 +++++++ qapi/trace.json | 40 +++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 7c45a64363..0743459862 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -226,6 +226,13 @@ QEMU Machine Protocol (QMP) events Use the more generic event ``DEVICE_UNPLUG_GUEST_ERROR`` instead. +``vcpu`` trace events (since 8.1) +''''''''''''''''''''''''''''''''' + +The ability to instrument QEMU helper functions with vCPU-aware trace +points was removed in 7.0. However QMP still exposed the vcpu +parameter. This argument has now been deprecated and the remaining +remaining trace points that used it are selected just by name. Human Monitor Protocol (HMP) commands ------------------------------------- diff --git a/qapi/trace.json b/qapi/trace.json index 6bf0af0946..39b752fc88 100644 --- a/qapi/trace.json +++ b/qapi/trace.json @@ -37,13 +37,14 @@ # # @vcpu: Whether this is a per-vCPU event (since 2.7). # -# An event is per-vCPU if it has the "vcpu" property in the -# "trace-events" files. +# Features: +# @deprecated: Member @vcpu is deprecated, and always ignored. # # Since: 2.2 ## { 'struct': 'TraceEventInfo', - 'data': {'name': 'str', 'state': 'TraceEventState', 'vcpu': 'bool'} } + 'data': {'name': 'str', 'state': 'TraceEventState', + 'vcpu': { 'type': 'bool', 'features': ['deprecated'] } } } ## # @trace-event-get-state: @@ -52,19 +53,15 @@ # # @name: Event name pattern (case-sensitive glob). # -# @vcpu: The vCPU to query (any by default; since 2.7). +# @vcpu: The vCPU to query (since 2.7). # -# Returns: a list of @TraceEventInfo for the matching events -# -# An event is returned if: +# Features: +# @deprecated: Member @vcpu is deprecated, and always ignored. # -# - its name matches the @name pattern, and -# - if @vcpu is given, the event has the "vcpu" property. +# Returns: a list of @TraceEventInfo for the matching events # -# Therefore, if @vcpu is given, the operation will only match per-vCPU -# events, returning their state on the specified vCPU. Special case: -# if @name is an exact match, @vcpu is given and the event does not -# have the "vcpu" property, an error is returned. +# An event is returned if its name matches the @name pattern +# (There are no longer any per-vCPU events). # # Since: 2.2 # @@ -75,7 +72,8 @@ # <- { "return": [ { "name": "qemu_memalign", "state": "disabled", "vcpu": false } ] } ## { 'command': 'trace-event-get-state', - 'data': {'name': 'str', '*vcpu': 'int'}, + 'data': {'name': 'str', + '*vcpu': {'type': 'int', 'features': ['deprecated'] } }, 'returns': ['TraceEventInfo'] } ## @@ -91,15 +89,11 @@ # # @vcpu: The vCPU to act upon (all by default; since 2.7). # -# An event's state is modified if: -# -# - its name matches the @name pattern, and -# - if @vcpu is given, the event has the "vcpu" property. +# Features: +# @deprecated: Member @vcpu is deprecated, and always ignored. # -# Therefore, if @vcpu is given, the operation will only match per-vCPU -# events, setting their state on the specified vCPU. Special case: if -# @name is an exact match, @vcpu is given and the event does not have -# the "vcpu" property, an error is returned. +# An event is enabled if its name matches the @name pattern +# (There are no longer any per-vCPU events). # # Since: 2.2 # @@ -111,4 +105,4 @@ ## { 'command': 'trace-event-set-state', 'data': {'name': 'str', 'enable': 'bool', '*ignore-unavailable': 'bool', - '*vcpu': 'int'} } + '*vcpu': {'type': 'int', 'features': ['deprecated'] } } }