From nobody Tue Feb 10 02:55:03 2026 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1634230249742929.6794930058205; Thu, 14 Oct 2021 09:50:49 -0700 (PDT) Received: from localhost ([::1]:45046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mb3wO-00069T-EW for importer@patchew.org; Thu, 14 Oct 2021 12:50:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mb3cP-0003vS-CO for qemu-devel@nongnu.org; Thu, 14 Oct 2021 12:30:12 -0400 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]:39912) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mb3cM-0000q7-Np for qemu-devel@nongnu.org; Thu, 14 Oct 2021 12:30:08 -0400 Received: by mail-ed1-x533.google.com with SMTP id ec8so26616234edb.6 for ; Thu, 14 Oct 2021 09:30:04 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id x22sm2658404edv.14.2021.10.14.09.30.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 09:30:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Lm4cSr3hwZFhtpL9gf7YtW4ZZpF9fqVta4celsFuw+E=; b=XvHmCR8IB5pVXUM7o9x5fkz1pcpGz5yTuT0/kSUa8RE4mHFm473zFmSG07FEzmjarT uRDkt05zQ6g6w92Xe7qpBVgsltmSbcBM6a3AJwzU4Xm3vV1nKpgT5vKgvtps9cnDDgZg qpc7BDPhfXy7UTj9Q+ZhvcFu231nis411nAtGj1k+HqqZlarmD+jKwjq+TEfY8nqIpWq BUhbbX3nHJH//niftDEwhzS6kCDznJw5t0hTlQwhguS/bfSXN8OeZjvR5xkgnOkGk0wp cLtXfLCUEaqrgb8HEuCyGKZeXQk6j6CTxe8HB1i/OtydIrStLCJ8cn+YaEd4TL0qt1js 3uug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Lm4cSr3hwZFhtpL9gf7YtW4ZZpF9fqVta4celsFuw+E=; b=x14ZY2+CzbF93p9npjdbY0cmeK32AubpAXKN0jHyW6w/qQCRcY8d2Nak7CtV0CDUlf fd2UdZK4a7wMMvNQ+HFi628lxd3O+IiV1nZs332dLg+0dYriE9Jrovp1+RqiPMqCR/Ec elFQUAZqkWlXkHegPqAQO5yW/QxKEGw9CnzQom7GKVrkb0Rsmae4XPKRFlHQBkjz9R6C k2IB/eyp7qif9qAwRuUn4GGMZklvg1F/wswmxYdJGMUgpQr2vmLHibbyOjF9b1Mhpy4Z T7Qh0SdtYkTpJQi/6Uz6/c78/E9P1F/Qwhs5+sg3g/NsZ6OkXYaaF+l8Kl/2rljceX9i UaPQ== X-Gm-Message-State: AOAM533ZIva9KHsSQvGLfLjiC6vT1gUqb+QP2L2LHBUujGKvKbCpLqDV QCSAj+j9jlgkCJXxbOuW2heG4jKw7t0= X-Google-Smtp-Source: ABdhPJxVnLN1ESeZydIdmTIP6qtq6fRt5zrNFMObSOcucHdVQhkIimcekp2El5gZ39NkkZS+FXTr1g== X-Received: by 2002:a17:906:a3c4:: with SMTP id ca4mr4866771ejb.529.1634229003432; Thu, 14 Oct 2021 09:30:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 25/26] meson-buildoptions: include list of tracing backends Date: Thu, 14 Oct 2021 18:29:37 +0200 Message-Id: <20211014162938.430211-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211014162938.430211-1-pbonzini@redhat.com> References: <20211014162938.430211-1-pbonzini@redhat.com> 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::533; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x533.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1634230251748100001 Content-Type: text/plain; charset="utf-8" Manually patch the introspection data to include the tracing backends. This works around a deficiency in Meson that will be fixed by https://github.com/mesonbuild/meson/pull/9395. Signed-off-by: Paolo Bonzini --- scripts/meson-buildoptions.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index 71ee56bd22..d48af99aaf 100755 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -58,7 +58,23 @@ def print_parse(options): print("}") =20 =20 +def fixup_options(options): + # Meson <=3D 0.60 does not include the choices in array options, fix t= hat up + for opt in options: + if opt["name"] =3D=3D "trace_backends": + opt["choices"] =3D [ + "dtrace", + "ftrace", + "log", + "nop", + "simple", + "syslog", + "ust", + ] + + options =3D load_options(json.load(sys.stdin)) +fixup_options(options) print("# This file is generated by meson-buildoptions.py, do not edit!") print_help(options) print_parse(options) --=20 2.31.1