From patchwork Tue May 23 12:49:55 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: 684905 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1697610wrt; Tue, 23 May 2023 05:50:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7mp57omv/iCg/8vvODtsnniyEa71T9R4we61XTBXk8z00vuna02HwBpkRMvlsWFnzVwzSk X-Received: by 2002:a05:620a:388f:b0:75b:23a1:8342 with SMTP id qp15-20020a05620a388f00b0075b23a18342mr3676268qkn.61.1684846220013; Tue, 23 May 2023 05:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684846219; cv=none; d=google.com; s=arc-20160816; b=KqlaPAlyMIyN4zX+v3KOf57E8lsck0c9o7DOsSoM/OKO4vC56dLwC+bnBxbytipBf1 3FzhWCN5bVeCew0r4e2aXQoldnNEmUVsOnAGjsRNxUHzcGah5UvyO0pkuR44d4+jBnBH gKU8Al9Szk5TxS5XAiDkeIJ7ioXnLC+a9GPBq93SEs2saAIMvueWsX0HNVSfiRXcW3vn /HwpuTfhKwr478UY9gYtaKc29Hkjq+AHGZ2cRpcAt7M35qy/il0KO/P3Vy41+nBVebWI 4PG3+Ut78jpuqoGVkHvaPm340wSiRR04mvWqkjyQ/am7MQuztQFKUWuu2y34VGZneVUC ta4w== 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=HT3f4xlRu6XVFJkMQtmY/b219drXYZCMSK1yobPtGSc=; b=oAAyam9/uchq55cP4vt5M7WByydYNut4EFZ5i9emVFZZ1pfSXX84lV5YWx0cO0M+3y u53xhbG3YLWwJlY8V5f3ehwpywwhAoe3nr6X9YQUhxYo8O2FnrqaWuotafayuSq2rQ9k qmt0YPxg1dJn+LIs8RyyHzyDDcHC/u5GvQA5rJOnlagjo7ntd4zrWl91hR0l0pjKgLxV O49ywcH1pjnFOk31Sz1+BxQClkTgQnMuRP7BIDaE4/OefDBJpb1D28H2Ze8CvGGIXEy3 6U9AhlLrNV4lmQGTi4t+hv56UtEcmm4PAUXj8rG+P4QDNLlO9CN63TUThGBmMGKsEUyA ST/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HNzzzVP2; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.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.129.124]) by mx.google.com with ESMTPS id j1-20020ae9c201000000b0075929859d03si4705812qkg.785.2023.05.23.05.50.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 05:50:19 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HNzzzVP2; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 170.10.129.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=1684846219; 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=HT3f4xlRu6XVFJkMQtmY/b219drXYZCMSK1yobPtGSc=; b=HNzzzVP2OBwyTylDaGSP/Q4FCLhmbrtSi+JdlBJmdUbdA1ddR505lSrcaE+Y4V2ct7UdYq KBViyZdTFyvkB+nNWyGIQ3yEaj/jjYOTWXeuG2S96Gf3q7BfY6Keib3vATYtfV6cYO68vK sPyW0S0ZBNsCiMpeWRDyIMWyyqwP7WQ= 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-641--N2FFE4YNSet6DCrT7lnxA-1; Tue, 23 May 2023 08:50:15 -0400 X-MC-Unique: -N2FFE4YNSet6DCrT7lnxA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D7E39803C82; Tue, 23 May 2023 12:50:12 +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 BEADD40CFD4A; Tue, 23 May 2023 12:50:12 +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 9DD841946A41; Tue, 23 May 2023 12:50:12 +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-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A5C0419465A8 for ; Tue, 23 May 2023 12:50:06 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 94ECC2166B25; Tue, 23 May 2023 12:50:06 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8CB3D2166B27 for ; Tue, 23 May 2023 12:50:06 +0000 (UTC) Received: from us-smtp-inbound-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.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 70AB085828C for ; Tue, 23 May 2023 12:50:06 +0000 (UTC) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-589--QLqBAE_MTOncSuelbqQAg-2; Tue, 23 May 2023 08:50:04 -0400 X-MC-Unique: -QLqBAE_MTOncSuelbqQAg-2 Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-3f60444238cso23905445e9.3 for ; Tue, 23 May 2023 05:50:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684846203; x=1687438203; 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=HT3f4xlRu6XVFJkMQtmY/b219drXYZCMSK1yobPtGSc=; b=VBk+AN2x9AlDRNLfg3JXEpArnK4dwtholVl73ByODlFg5CMTAVEhlCuDs42qQz+6VP PtXVhuqHaISPBRw8NNILThTSpgvSIzeGeEpkWGsS4QJNsY/GREDzZhiviEaT8mfUDPXB ZFNwcKVw+Uu2u0kJ1kDau8fIbOpP6tmh4jGfdVB+hTm753RqkJGChba2ajmoED1eMSji HmrSOKBZkAMeyzTClsMjBR1LAkDo1V6Zk7IUP1xiRDGVx86GK/DwaNcInLhSnNeSjStN AvA8HGWdbYNBgy6HHpCofaR0+3LbkpuWNqQM1PVYpXwJwh2Y2yWYVY9vXavAIgc+OBUw Pezg== X-Gm-Message-State: AC+VfDwRN19wbXlMGdi3s/GgEVSD5JImtgnXmFzRkEdLI3l7gn+PDo+E yfj9thzFgieAXCJvQJlBcLsF2g== X-Received: by 2002:a5d:45c4:0:b0:309:3ddc:1c8d with SMTP id b4-20020a5d45c4000000b003093ddc1c8dmr8660172wrs.70.1684846203637; Tue, 23 May 2023 05:50:03 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z12-20020a5d640c000000b00307c8d6b4a0sm10995580wru.26.2023.05.23.05.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 05:50:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7EFB21FFC0; Tue, 23 May 2023 13:50:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [PATCH v4 05/10] qapi: make the vcpu parameters deprecated for 8.1 Date: Tue, 23 May 2023 13:49:55 +0100 Message-Id: <20230523125000.3674739-6-alex.bennee@linaro.org> In-Reply-To: <20230523125000.3674739-1-alex.bennee@linaro.org> References: <20230523125000.3674739-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.6 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, Michael Roth , Riku Voipio , Christian Schoenebeck , Markus Armbruster , Greg Kurz , Yanan Wang , Marcel Apfelbaum , Kyle Evans , Paolo Bonzini , Richard Henderson , Eric Blake , Warner Losh Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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. Message-Id: <20230420150009.1675181-6-alex.bennee@linaro.org> Reviewed-by: Stefan Hajnoczi Reviewed-by: Richard Henderson Message-Id: <20230503091756.1453057-6-alex.bennee@linaro.org> Signed-off-by: Alex Bennée Message-Id: <20230505155336.137393-6-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé --- v4 - used @deprecated in json - added note to deprecated.rst --- docs/about/deprecated.rst | 9 +++++++++ qapi/trace.json | 38 ++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index e934e0a13a..e44cde057f 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -254,6 +254,15 @@ it. Since all recent x86 hardware from the past >10 years is capable of the QEMU API (QAPI) events ---------------------- +``vcpu`` trace events (since 8.1) +''''''''''''''''''''''''''''''''' + +The ability to instrument QEMU helper functions with vcpu aware trace +points was removed in 7.0. However the QAPI still exposed the vcpu +parameter. This argument has now been deprecated and the remaining +used trace points converted to plain trace points selected just by +name. + ``MEM_UNPLUG_ERROR`` (since 6.2) '''''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/qapi/trace.json b/qapi/trace.json index 6bf0af0946..aac58e875b 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 false. # # 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,17 @@ # # @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). +# +# Features: +# @deprecated: Member @vcpu is deprecated, and always false. # # Returns: a list of @TraceEventInfo for the matching events # # An event is returned if: # -# - its name matches the @name pattern, and -# - if @vcpu is given, the event has the "vcpu" property. -# -# 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. +# - its name matches the @name pattern +# There are no longer any per-vCPU events # # Since: 2.2 # @@ -75,7 +74,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 +91,13 @@ # # @vcpu: The vCPU to act upon (all by default; since 2.7). # -# An event's state is modified if: +# Features: +# @deprecated: Member @vcpu is deprecated, and always false. # -# - its name matches the @name pattern, and -# - if @vcpu is given, the event has the "vcpu" property. +# An event's state is modified if: # -# 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. +# - its name matches the @name pattern +# There are no longer any per-vCPU events # # Since: 2.2 # @@ -111,4 +109,4 @@ ## { 'command': 'trace-event-set-state', 'data': {'name': 'str', 'enable': 'bool', '*ignore-unavailable': 'bool', - '*vcpu': 'int'} } + '*vcpu': {'type': 'int', 'features': ['deprecated'] } } }