From nobody Fri Oct 18 08:45:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1717053480; cv=none; d=zohomail.com; s=zohoarc; b=HzLFzaMedEp6P6M38MWtNPWdGMtb85Q9AbJI9KxvUq5ctDYHFAmEx2KknzA5wquOsCQFJIacnIxZFWwhsa4NcxVVG8XkvCiNTtNgJYUnCim165AvgWoAiiAUQn2xs0qTm/tzLjJzTXTr5G4T2teqjL7KEfz1ZUvv8iffXB5mR80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717053480; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kvNLJpx/j5Zo3jUuprmrG9QQOioGNCv1AT/8qxYHato=; b=Nu9rYHqAzGbP2Ziesrem/HKAsnjreUVEJw9hpvWqzE47WeO4w1lbQmAEMQrVctwoyCNlapUA6xgyXpVWEnmieKhGcRBOFrKLcQN+4htV4x3ued62jLgqogS0z1yvvjJcHODpNBMEy84RRXrc/77wqv9aeOW2yCrzVlnqXGqc+x8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1717053480207930.5597230967697; Thu, 30 May 2024 00:18:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCa2a-00046z-TH; Thu, 30 May 2024 03:17:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sCa2X-0003lx-75 for qemu-devel@nongnu.org; Thu, 30 May 2024 03:17:33 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sCa2T-0005Z0-5I for qemu-devel@nongnu.org; Thu, 30 May 2024 03:17:30 -0400 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-57a1fe63a98so258772a12.1 for ; Thu, 30 May 2024 00:17:28 -0700 (PDT) Received: from m1x-phil.lan (xbn44-h02-176-184-35-50.dsl.sta.abo.bbox.fr. [176.184.35.50]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3557a08a878sm16506109f8f.43.2024.05.30.00.17.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 30 May 2024 00:17:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1717053447; x=1717658247; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kvNLJpx/j5Zo3jUuprmrG9QQOioGNCv1AT/8qxYHato=; b=xeJyC6XsXA6ZwkQ/9uJ3898wIEn7oo5gk2l1orY+tXb3lVAkyBN9N2fW7G1G18jriS VR14WKujPtRbr5GlLT+CFZQllkFn1FwFOXL+QrXZbuLf1I/unxvhzqzE3ztlDbeHPoaU 0t/KaSXyq9QiKbcvyX7CCIJzEAT1uFN0HDxp/yTwVFmzUsudc3pRZL+rp2bpbYYwhooy UPKH9yoGcmrGwxt3IY9JlKjmOrisksBgwuPVW9zOu/gDmQsV5ObL4DcVzw8aQXP0+7jU 2zknAUZ/ydy0xDxExAbcCwhZQsc7p18rVktEY1MKGTnHySqnZj7ZQ8AFAKlejJx2MnD5 uTWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717053447; x=1717658247; 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=kvNLJpx/j5Zo3jUuprmrG9QQOioGNCv1AT/8qxYHato=; b=ScPMV7GMOy0+Kp03mwwHvlZmjM80H7kQLdfuyyMSBQ2iyUd0/Eijm9nt6O+gRKTXFp +WKwLTztwilqx5SXfKWWegIoUGSrO/JyYseF+yodbuCTxTtPDs/68Gj0FQZUqIQjybgQ HiGv07BbkEAQtRY+CwJMJP/HZ54h+m/zhL93WxnqFxhtV9ROgxyxlWhPeFM8uJFWZadb zZNis1DLKbJmfZOM5VOlm3vnQTCWR/urUVQ4II3DPNhVgpXezV0c3jTYfn42Ni631bt2 abQZVXGGFdjY4HEpE8hUB8tsbvYkMsRTzJ62BD3fBZr9OqMekmXFNyD4OIwMPgTBcYW+ cGkA== X-Gm-Message-State: AOJu0Ywz7Cxg5mSomO7cZMhpJ1CQ0z2LzyuS5T1TejY69g/PU1cB382d FJtNbV151lc70phtcCskfAUr1J4fS9SJIELunsszf8UFyT8oQofgj677q20qrvPjNFb/uNfouwO v X-Google-Smtp-Source: AGHT+IFd0MQME9y+AdoHJ/L+l9sF0jKQLvOXrwpGfTgPTE2I1eWDnEJvRLUCykaPdAQ6KVrS8JI3zQ== X-Received: by 2002:a17:906:28cd:b0:a55:8f2a:950d with SMTP id a640c23a62f3a-a65e8d15723mr67171066b.16.1717053447075; Thu, 30 May 2024 00:17:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , David Gibson , Nicholas Piggin , devel@lists.libvirt.org, Marcel Apfelbaum , Harsh Prateek Bora , Mads Ynddal , Markus Armbruster , Stefan Hajnoczi , Eduardo Habkost , Igor Mammedov , Greg Kurz , Yanan Wang , qemu-ppc@nongnu.org, Eric Blake , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Daniel Henrique Barboza , Ani Sinha Subject: [PATCH 2/2] trace: Remove deprecated 'vcpu' field from QMP trace events Date: Thu, 30 May 2024 09:15:48 +0200 Message-ID: <20240530071548.20074-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240530071548.20074-1-philmd@linaro.org> References: <20240530071548.20074-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::535; envelope-from=philmd@linaro.org; helo=mail-ed1-x535.google.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, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1717053481079100003 'vcpu' fields are deprecated since commit 5485e52a33 ("qapi: make the vcpu parameters deprecated for 8.1"), time to remove them. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/about/deprecated.rst | 11 ----------- docs/about/removed-features.rst | 6 ++++++ qapi/trace.json | 27 +++------------------------ trace/qmp.c | 2 -- trace/trace-hmp-cmds.c | 4 ++-- 5 files changed, 11 insertions(+), 39 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 4a61894db6..187c8a3f97 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -148,17 +148,6 @@ accepted incorrect commands will return an error. User= s should make sure that all arguments passed to ``device_add`` are consistent with the documented property types. =20 -QEMU Machine Protocol (QMP) 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 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. - Host Architectures ------------------ =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index f1e70263e2..1e64c27cd8 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -679,6 +679,12 @@ QEMU Machine Protocol (QMP) events =20 MEM_UNPLUG_ERROR has been replaced by the more generic ``DEVICE_UNPLUG_GUE= ST_ERROR`` event. =20 +``vcpu`` trace events (removed in 9.1) +'''''''''''''''''''''''''''''''''''''' + +The ability to instrument QEMU helper functions with vCPU-aware trace +points was removed in 7.0. + =20 Human Monitor Protocol (HMP) commands ------------------------------------- diff --git a/qapi/trace.json b/qapi/trace.json index 043d12f83e..9ebb6d9eaf 100644 --- a/qapi/trace.json +++ b/qapi/trace.json @@ -35,17 +35,10 @@ # # @state: Tracing state. # -# @vcpu: Whether this is a per-vCPU event (since 2.7). -# -# Features: -# -# @deprecated: Member @vcpu is deprecated, and always ignored. -# # Since: 2.2 ## { 'struct': 'TraceEventInfo', - 'data': {'name': 'str', 'state': 'TraceEventState', - 'vcpu': { 'type': 'bool', 'features': ['deprecated'] } } } + 'data': {'name': 'str', 'state': 'TraceEventState' } } =20 ## # @trace-event-get-state: @@ -54,12 +47,6 @@ # # @name: Event name pattern (case-sensitive glob). # -# @vcpu: The vCPU to query (since 2.7). -# -# Features: -# -# @deprecated: Member @vcpu is deprecated, and always ignored. -# # Returns: a list of @TraceEventInfo for the matching events # # Since: 2.2 @@ -71,8 +58,7 @@ # <- { "return": [ { "name": "qemu_memalign", "state": "disabled", "vc= pu": false } ] } ## { 'command': 'trace-event-get-state', - 'data': {'name': 'str', - '*vcpu': {'type': 'int', 'features': ['deprecated'] } }, + 'data': {'name': 'str' }, 'returns': ['TraceEventInfo'] } =20 ## @@ -86,12 +72,6 @@ # # @ignore-unavailable: Do not match unavailable events with @name. # -# @vcpu: The vCPU to act upon (all by default; since 2.7). -# -# Features: -# -# @deprecated: Member @vcpu is deprecated, and always ignored. -# # Since: 2.2 # # Example: @@ -101,5 +81,4 @@ # <- { "return": {} } ## { 'command': 'trace-event-set-state', - 'data': {'name': 'str', 'enable': 'bool', '*ignore-unavailable': 'bool', - '*vcpu': {'type': 'int', 'features': ['deprecated'] } } } + 'data': {'name': 'str', 'enable': 'bool', '*ignore-unavailable': 'bool' = } } diff --git a/trace/qmp.c b/trace/qmp.c index 3e3971c6a8..074a27b204 100644 --- a/trace/qmp.c +++ b/trace/qmp.c @@ -48,7 +48,6 @@ static bool check_events(bool ignore_unavailable, bool is= _pattern, } =20 TraceEventInfoList *qmp_trace_event_get_state(const char *name, - bool has_vcpu, int64_t vcpu, Error **errp) { TraceEventInfoList *events =3D NULL; @@ -86,7 +85,6 @@ TraceEventInfoList *qmp_trace_event_get_state(const char = *name, =20 void qmp_trace_event_set_state(const char *name, bool enable, bool has_ignore_unavailable, bool ignore_un= available, - bool has_vcpu, int64_t vcpu, Error **errp) { TraceEventIter iter; diff --git a/trace/trace-hmp-cmds.c b/trace/trace-hmp-cmds.c index 86211fce27..d38dd600de 100644 --- a/trace/trace-hmp-cmds.c +++ b/trace/trace-hmp-cmds.c @@ -40,7 +40,7 @@ void hmp_trace_event(Monitor *mon, const QDict *qdict) Error *local_err =3D NULL; =20 qmp_trace_event_set_state(tp_name, new_state, - true, true, false, 0, &local_err); + true, true, &local_err); if (local_err) { error_report_err(local_err); } @@ -82,7 +82,7 @@ void hmp_info_trace_events(Monitor *mon, const QDict *qdi= ct) name =3D "*"; } =20 - events =3D qmp_trace_event_get_state(name, false, 0, &local_err); + events =3D qmp_trace_event_get_state(name, &local_err); if (local_err) { error_report_err(local_err); return; --=20 2.41.0