From patchwork Tue Nov 5 10:43:31 2024 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: 840756 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1ace:b0:37d:45d0:187 with SMTP id i14csp271394wry; Tue, 5 Nov 2024 02:44:00 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUOQZulrokk/3RFY4L0TtnkOaS53mlpIrR9i2n+l4+A/L7nv0OhGTU2LRBWjPoSvujViWCtWw==@linaro.org X-Google-Smtp-Source: AGHT+IHYoI4XbkgESGr5vnGU2CbE56qTHqvDNbHynbAKH/Z43rwtzfzvgJtrkEXrpfAjdU28GY61 X-Received: by 2002:a05:6122:4f84:b0:50d:66e1:826c with SMTP id 71dfb90a1353d-5106b1c0385mr17315231e0c.11.1730803439939; Tue, 05 Nov 2024 02:43:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1730803439; cv=none; d=google.com; s=arc-20240605; b=Jm29ZSkIrdK4L9bAG+ixmt0QicwEs5EWgPqeeyDUbd4hEZjDVxGRR4ktitwcYD3gT0 ffwV32xzXNo0gr1Yf5S2Tn5Yh1Aqo3Da58KwadlHoh1Fz2p1FPxX2eCcKhDqeQtn2a/j /1Ytx+bTk8slZRFHsbqeym2JSnwQSSQzfXengCnylLUY388Da1BgsyKrDmQDRzA/KysG cEj+Y4dvAyYjA2SeWkJiqjsdsAoCuMH/15p0nhKHAME47jnHOcDurLfjjyp2RxTT2LyQ pAzC4FiajNaiecVJbfKbesnHWaAMpy73TZEFNQy97H8/mJX5ED373jpAHpGvaE84WNvL 5Z5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=PNuzYa5+nZdqvnGVKWFxmNuP1iytRrvncpaN0YbpD8M=; fh=tsEijvkx1NbT6Ur0mdaogUfqsbV1AR4G4GAX7WVZ83s=; b=OlfHOMd7XdQET3PlXRNr/Nkbaci+i5rlv30inCcJqXhlJCQ4uRHr+9PvIsUF5kgLQQ vMKZZ1kELQb8+wcrxkI9FiG/j0lfo/KY+KYtvhcOMI39YDi2i3Apnwef0Eso6MKmB4jW pBOSXJXeUt+KXoh8F/RUeS1aXHRha+5C/Eb7Dm1UIs0FsBRO5yu6WAFzQynSdpQZYeBx CB+pFBHJOTP5PKiuP5w+/Jw2EbxpQse4HnffBg48tC0VyX9dWXeA5OFVzZqZYoliycGo ztqOVsmGb0GeQ48b3HdcOHcaUcF7lrXQLrR77I4clt+7J4PQV2dv8YxYO+0lYmSiX4Zp v+mA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mTRCD0vS; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6d372a8a4e1si65600436d6.202.2024.11.05.02.43.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Nov 2024 02:43:59 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=mTRCD0vS; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8H2G-00032P-Pu; Tue, 05 Nov 2024 05:43:44 -0500 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 1t8H2A-0002xS-GT for qemu-devel@nongnu.org; Tue, 05 Nov 2024 05:43:40 -0500 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t8H28-0003Qf-Tb for qemu-devel@nongnu.org; Tue, 05 Nov 2024 05:43:38 -0500 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5c9388a00cfso6183206a12.3 for ; Tue, 05 Nov 2024 02:43:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1730803415; x=1731408215; 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=PNuzYa5+nZdqvnGVKWFxmNuP1iytRrvncpaN0YbpD8M=; b=mTRCD0vSx0l/sTOp/Zq43dapnB4SdZ9JBwyT9BFf3nmP+/3QuLMGfY17USqQxKcnrI 1E5nHJw9v8u7nsh8oxRVZjJCK9VHN9Nxnd2K1bJeVqQPB2j2zRiTaBdKdMT2lldrkv4h 9EmfNJ78YpqY9xpEu/QaeayFJBwaHFCPy6fIt8q+j/Hl0HBxNzM98UjZgTlQztWQX2z3 iHUOqpktx0kZjPEN9Kz09Jxddadt+GvXib5eyx8jXRLSQWyG7S4OEShtg3+N1r8Xp/AT O3lLqrs5gO0okwHMua3RvwjqVnAQwJwOpNGyJ175zW513541YAxFKo3LTmfxgcTVYWiS e5BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730803415; x=1731408215; 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=PNuzYa5+nZdqvnGVKWFxmNuP1iytRrvncpaN0YbpD8M=; b=MLT1F5UQibr2KoOMeX49YvhHJWsR/0DKtWm6s0MXcE6Qd8fAQHtCHw3nos+teIYWhM Jt9W8A7BEqLe1Tq/mmmzzom3sVwnnt61RF4vyi+2dqArQpcSPc8vjObLfal/aIqAlEii oG47H5AEjp425T+fSIjubO3pel912NiNmbiIRes06/gia9URWK1bfB8+yfxc/gOnG0xr iKJPsV1UFAbUdUOM6H63hV9NZ0JkRNaK19CG9L3MgxHF1tyV7Xa2CoKmPUe0evNG60jp ZV4VgWjUK4hAVbfpfwsF1ko/gnflYXThrJVXXSCivO91H6dxO9jswPgZIi9cotXVjalM l+Mg== X-Gm-Message-State: AOJu0YwuFPg8k9WhhOVm6urpoyXbDzCacrOnBh33invdZkFvQH1uRBvM 0lyh3A++b1q/edQHcKfYivMpHKfZ4xxyjYKavOqAfwpvRkId2NoDmCQF3GL1oF4= X-Received: by 2002:a05:6402:1ed2:b0:5ce:cfc4:1f90 with SMTP id 4fb4d7f45d1cf-5cecfc42115mr6374979a12.1.1730803415135; Tue, 05 Nov 2024 02:43:35 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cee6ab05casm1121106a12.26.2024.11.05.02.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 02:43:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id BA52F5F89E; Tue, 5 Nov 2024 10:43:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Alexandre Iooss , Mahmoud Mandour Subject: [PULL 1/3] contrib/plugins/cflow: fix warning Date: Tue, 5 Nov 2024 10:43:31 +0000 Message-Id: <20241105104333.2534823-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241105104333.2534823-1-alex.bennee@linaro.org> References: <20241105104333.2534823-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52f.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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier contrib/plugins/cflow.c: In function ‘plugin_exit’: contrib/plugins/cflow.c:167:19: error: declaration of ‘n’ shadows a previous local [-Werror=shadow=local] 167 | NodeData *n = l->data; | ^ contrib/plugins/cflow.c:139:9: note: shadowed declaration is here 139 | int n = 0; | ^ Signed-off-by: Pierrick Bouvier Message-Id: <20241023212812.1376972-2-pierrick.bouvier@linaro.org> Signed-off-by: Alex Bennée diff --git a/contrib/plugins/cflow.c b/contrib/plugins/cflow.c index 6faa55d10d..b39974d1cf 100644 --- a/contrib/plugins/cflow.c +++ b/contrib/plugins/cflow.c @@ -136,7 +136,7 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) g_autoptr(GString) result = g_string_new("collected "); GList *data; GCompareFunc sort = &hottest; - int n = 0; + int i = 0; g_mutex_lock(&node_lock); g_string_append_printf(result, "%d control flow nodes in the hash table\n", @@ -162,8 +162,8 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) data = g_list_sort(data, sort); for (GList *l = data; - l != NULL && n < topn; - l = l->next, n++) { + l != NULL && i < topn; + l = l->next, i++) { NodeData *n = l->data; const char *type = n->mid_count ? "sync fault" : "branch"; g_string_append_printf(result, " addr: 0x%"PRIx64 " %s: %s (%s)\n", From patchwork Tue Nov 5 10:43:32 2024 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: 840758 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1ace:b0:37d:45d0:187 with SMTP id i14csp271551wry; Tue, 5 Nov 2024 02:44:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXqDZHUgTLeL3zVoHXKWq2uA1XVNsO0FjWGEoax+YtK4ZsHXpWAf8WV9AMk+zlIqXAsYGCyjA==@linaro.org X-Google-Smtp-Source: AGHT+IHbTt7T++S62HfoSr4hJntHP34n4Gh0ncCeruMrXJ6bhoVxqZZso4lTX8Kzvpe8QvkCMyDv X-Received: by 2002:a05:6214:3f92:b0:6cd:efb4:2efe with SMTP id 6a1803df08f44-6d354318a30mr336612986d6.24.1730803470077; Tue, 05 Nov 2024 02:44:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1730803470; cv=none; d=google.com; s=arc-20240605; b=b6hdo0g1WzeVpNpGRu2Dg+Ec6aXzOMEdDrhmjicShBUQ6EKTXgjWxggn1rptv+bcnN S/iJYeXAA7bGWg8dxzwFxTg98uND2Dai1dkZUyLCpdZsL6sQT8rUQrU0fe9A1CzhYoos 2SFWWCUKRJ+qgzIo1X+ok5YHjok6RGEdcW95rnnO9K8FZg6mhEhDqTSPDXr3Mh3Oea/a i8P7SVtMt6+I2LbDLwubo7QIdjov3jO7xV4rBe8GMZmt/bCega3IkVxxqKSty1OXMqDY e0Dn8lh+fY9k5X32TTKoImIusuul98xpu4S4ka0iEY5IrsLziX2wmCurEULIpoND9/XB j9QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=XKZMku98sdxCTDahr+TLjNAtOni8kkq03uBM5KKnleo=; fh=2dPBkpE6mzqQuNn6t3dwzPzz0z4bBk+6IiOvQXsP7Xg=; b=HSFs0GOyyCC3eaAvPpUbkcTUfH9VoAcejmw4FriuQxWhxvvC62j/+qaeKS0tftb3u2 SbNiu+Z6HXNjmVtY3SYt2WFbC6mdCB6RaNZEJAGP11hJG6OQkUEh7HfJRBEy9hPp4TvC YkaQFOV2mtN9sSKp2zvgPWExXH+Ojrh2DIFSbB0qsrJvDGg/HtIRBGgSrB7E6Fd2mXqP uFNDtEK5Bgb98cbaxxTlEZRDksQzifDvgKpLFEJr44sCVogYWHylYyeG4ggzsVHwNo3F V80xJAynUZrTiFkJNWaQiUHiR+R+cDXR4ObcwqS66JPA7mpqqz1u5yv3j/bC2Phgec1H S8BQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="NoXro3/3"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6d353fae295si132838506d6.13.2024.11.05.02.44.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Nov 2024 02:44:30 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b="NoXro3/3"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8H2I-00037b-3y; Tue, 05 Nov 2024 05:43:46 -0500 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 1t8H2A-0002xU-Sn for qemu-devel@nongnu.org; Tue, 05 Nov 2024 05:43:40 -0500 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t8H29-0003Qh-7Q for qemu-devel@nongnu.org; Tue, 05 Nov 2024 05:43:38 -0500 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a9a6b4ca29bso683759166b.3 for ; Tue, 05 Nov 2024 02:43:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1730803415; x=1731408215; 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=XKZMku98sdxCTDahr+TLjNAtOni8kkq03uBM5KKnleo=; b=NoXro3/3Ht2iXvyAY3c+jUU8uARqLvKzVfbGuJkvi9j83VeqQ67Fp8zWaZTm41YmlV YfkdyYlkzeHzoq4lRL+q8YqLluKucp8uEK6JV/aV8MphcZtSmBQGUEjldVpgx9MmR2ln uPvOXUtSLqG5lUk1dPw0/RTGyDTnM3nYrJOMg4ZVgtgeyiltbCrOAh1zJt44HrTWhql1 UGR1l7EegPbJaOGMzO0IPh+Mqm/Qk1jwwLSQXcsKnJdvCoE4KQXNTBPDiA1PaWecn5Jl tbQyRdjrEoaBg8JgaIOZkFkPgsv0PCrIZHjo+rCs3WdLJGe0RPyrfO3pedbQbFccFctD cgyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730803415; x=1731408215; 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=XKZMku98sdxCTDahr+TLjNAtOni8kkq03uBM5KKnleo=; b=O9I3QH81ZuQ4/N/6QPGyIrf0Gryrok3SwxuXDPJ1SnNKS0dvTBbtOHx7fCo0r93wWM idvb0B0KZTHU7LGaW9/wI42fOmb0NA3GRmQqOhhZQ4KEOBfuxYFtkMSkM9uM+PUh1cwG 7tEYbmVBB4XzSatOkfoZ6jMx4VsVnAM2nBB/EYmw9dciDWpF0hjAfrk0A+eYtYTDCqOh UzY0rj8dFpUGoYtsmYzETHW1qIQihEFzVpyzpIQddnAl6YYlDTaBOf2YEtO9NJopK3oi yngeWA/FgHRkPvkUbBOZ2ia7hYl1JUAZi4XeB6W5cWXrVpGn1kiqI08OhoU4L7nDaSWh cevQ== X-Gm-Message-State: AOJu0YzHD09xg8GDCtjWb4umOECXcrxry+wuEXL4i2CcdZx5pMDQIjfH 2cCkeGZQryGxIcIFBEP/ed6Zxwv79VwprnVp2wXSI1jTG0xaD67c1VEgVFzutC4= X-Received: by 2002:a17:906:3755:b0:a9e:65a8:b1fd with SMTP id a640c23a62f3a-a9e65a8b677mr1282945866b.22.1730803415492; Tue, 05 Nov 2024 02:43:35 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb16a2fcbsm115912166b.37.2024.11.05.02.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 02:43:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D0CF95F8CF; Tue, 5 Nov 2024 10:43:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Alexandre Iooss , Mahmoud Mandour , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= Subject: [PULL 2/3] meson: build contrib/plugins with meson Date: Tue, 5 Nov 2024 10:43:32 +0000 Message-Id: <20241105104333.2534823-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241105104333.2534823-1-alex.bennee@linaro.org> References: <20241105104333.2534823-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x631.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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier Tried to unify this meson.build with tests/tcg/plugins/meson.build but the resulting modules are not output in the right directory. Originally proposed by Anton Kochkov, thank you! Solves: https://gitlab.com/qemu-project/qemu/-/issues/1710 Signed-off-by: Pierrick Bouvier Message-Id: <20241023212812.1376972-3-pierrick.bouvier@linaro.org> Signed-off-by: Alex Bennée diff --git a/meson.build b/meson.build index c386593c52..2fe34c4462 100644 --- a/meson.build +++ b/meson.build @@ -3690,6 +3690,10 @@ subdir('accel') subdir('plugins') subdir('ebpf') +if 'CONFIG_TCG' in config_all_accel + subdir('contrib/plugins') +endif + common_user_inc = [] subdir('common-user') diff --git a/contrib/plugins/meson.build b/contrib/plugins/meson.build new file mode 100644 index 0000000000..63a32c2b4f --- /dev/null +++ b/contrib/plugins/meson.build @@ -0,0 +1,28 @@ +contrib_plugins = ['bbv', 'cache', 'cflow', 'drcov', 'execlog', 'hotblocks', + 'hotpages', 'howvec', 'hwprofile', 'ips', 'stoptrigger'] +if host_os != 'windows' + # lockstep uses socket.h + contrib_plugins += 'lockstep' +endif + +t = [] +if get_option('plugins') + foreach i : contrib_plugins + if host_os == 'windows' + t += shared_module(i, files(i + '.c') + 'win32_linker.c', + include_directories: '../../include/qemu', + link_depends: [win32_qemu_plugin_api_lib], + link_args: ['-Lplugins', '-lqemu_plugin_api'], + dependencies: glib) + else + t += shared_module(i, files(i + '.c'), + include_directories: '../../include/qemu', + dependencies: glib) + endif + endforeach +endif +if t.length() > 0 + alias_target('contrib-plugins', t) +else + run_target('contrib-plugins', command: find_program('true')) +endif From patchwork Tue Nov 5 10:43:33 2024 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: 840759 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1ace:b0:37d:45d0:187 with SMTP id i14csp271630wry; Tue, 5 Nov 2024 02:44:43 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWokuTum7iRmqR5r/uAlP+IlzOowhw8vYYNunhfhKGP9y/jLdXDYtVZYC/lLAMr0K7hBOJaPg==@linaro.org X-Google-Smtp-Source: AGHT+IF9rRcpePJTXb6Js0YSl8ljr+m8Y1GNwFl88Fmp1YGuLAcSOWDjAb9Ut4/XU07TFG53Q6Qf X-Received: by 2002:a05:690c:5:b0:6de:c0e:20ef with SMTP id 00721157ae682-6e9d88ecdc1mr343411897b3.7.1730803483057; Tue, 05 Nov 2024 02:44:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1730803483; cv=none; d=google.com; s=arc-20240605; b=FkkbbBIb2HzsP9h4kQueKpqYnQ0KJY4X1NlcUVnrR9eVDtKS5phqp2Py+YqiG7rWgd lFnopseQMzqeU26nQhFPhg3P7dMkYxxs9raAPT4tpYfBzFQ+xHqi8vfIBPbgYiklx0Wr FHt9ertKczYblNw7lekHpsVAp/mXf7nbqsE8kWSgyCFk4hmcwijsi+49eXtRqjgka2wM hqtxqb5jme+1U8rAnMSekXWxWX8HSIypkqtJdggziW43W6Fg3jFcNOZUxolLh0cudOlG I5T4YCG+rn1AHEVAq5qraP6HoEYaCYHxz7rpBU75U3/0MuI3kNOUU/onIIGdD8USosCJ DHtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=5IOvvSHHpse3ZvASXv69Y+T+V6sjL0EftOtV43EOvAQ=; fh=mf2YxRmIp/BETYulCBMq9kDTJRFAIGi3QYDWCZxYzTM=; b=cdozozyeewrvt9vXIecrldoEAEe1YVdtAsmVUVcEBJF0Ngxcq98wvUjVQruGaDuDfl LpAWzAJ3hE5QxCh44kYtBuu9J/mObMy7tcS9yOM6riCve4r01yYQ+KV8tjO3DJEmkt0S /Sop0ya5sbj0JZB6hCjxvwHQ2BegMQExqawnNREwZfwCUHs2ffqtTr8i7yk4nfd2lz7O ZzxNpG8fHY8XDjIWTyqBUqn4Faz/O3lJc6zi+tNJaXdj0bmVidVJyniCymIPLp+8AjVD 0nb2tMq1mCKgnx0ySwv6bcOJJjqWyBeA2wfOoIPM1q2Q2sIRgs/LnyI0VlPR0p2zSJ3h 8r6A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sde7SnJS; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6d35416a9d8si129916276d6.263.2024.11.05.02.44.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Nov 2024 02:44:43 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=sde7SnJS; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8H2I-00039s-Ut; Tue, 05 Nov 2024 05:43:46 -0500 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 1t8H2C-0002xc-29 for qemu-devel@nongnu.org; Tue, 05 Nov 2024 05:43:41 -0500 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 1t8H29-0003Qk-HS for qemu-devel@nongnu.org; Tue, 05 Nov 2024 05:43:39 -0500 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5c9850ae22eso6524336a12.3 for ; Tue, 05 Nov 2024 02:43:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1730803416; x=1731408216; 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=5IOvvSHHpse3ZvASXv69Y+T+V6sjL0EftOtV43EOvAQ=; b=sde7SnJSGUz6iUqi0uri72PxR9YvDEGpPfnJUc810TyAlQabOb2sKFHZheM64YLKZq albB3ZAMVeeg8XgHOwDQEfaPnZu6HRy65iVEw/LZh/c2/Ru9hjqVkGntELs9pcDzL3V5 fN9TX+cP69Nb9KvWpjq6KRehimPWFdp2BcuJAtjhK273TcNaB3Dl722r6kAx8WQmcQxC OiExna+iCq2GzZUXf72onuhGNrXa3ZB3P3ZgvemqDcVSRtciZpRdDBEAwUn0w0Es9Pgz T4mXxFjQ3iwtyem61eMDb27x2Fp4AhYokqHgqjwUXVyjYbMRKMS7jJ6ZvSMk9XmQUuwb Oiig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730803416; x=1731408216; 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=5IOvvSHHpse3ZvASXv69Y+T+V6sjL0EftOtV43EOvAQ=; b=TKRWO7OTndJdT7K6k/k19c0VVkX0WehRlYoUw3Of6k4MdGiBK+rlMtGSly8U2kyRwz xXDSlO6HyO9eukELcV2HyA0CWaaUF61Z+6N2EnY5MCO3xA+7p2muG3vClWEB+W0AiQrT LXt9EiUJWhwCpDiYbi90qwPK30INI0PWhxNb6PyCtdffVfmaogZlSRaWCjkheTBPk021 s1AokGNfd6qeY488Nvyc+/iRqom1KXXKAHBuCaH6l4W4k4HoB0SkB1nbTWgshJ/GeKTl qnuOlNTseylEwZBZWCHkPQNww5dKU6eTIX2AVVw92pGMLM1V1JQw82oe3n7akRa6ATe5 zX2Q== X-Gm-Message-State: AOJu0Yxfs50EjnAxwY3HBtukNJI958TQ+mYpZVCwJoHMP8cb7+ckRbnq 67qR4m6AypNpPsGe3N4fVcn5xy0owGMem/xXH+K5T0J68YDe0v0K1BkeqIVBXow= X-Received: by 2002:a17:907:8686:b0:a9a:212d:4ecb with SMTP id a640c23a62f3a-a9de5d702eemr3669556966b.12.1730803415865; Tue, 05 Nov 2024 02:43:35 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9eb1813a33sm116606766b.185.2024.11.05.02.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2024 02:43:34 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E9E1E5F8EB; Tue, 5 Nov 2024 10:43:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Paolo Bonzini , Thomas Huth Subject: [PULL 3/3] contrib/plugins: remove Makefile for contrib/plugins Date: Tue, 5 Nov 2024 10:43:33 +0000 Message-Id: <20241105104333.2534823-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241105104333.2534823-1-alex.bennee@linaro.org> References: <20241105104333.2534823-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=alex.bennee@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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier Now replaced by meson build. Signed-off-by: Pierrick Bouvier Message-Id: <20241023212812.1376972-4-pierrick.bouvier@linaro.org> Signed-off-by: Alex Bennée diff --git a/configure b/configure index f24940ca77..096b1fddb7 100755 --- a/configure +++ b/configure @@ -1077,7 +1077,6 @@ if test "$plugins" != "no" && test $host_bits -eq 64; then plugins="no" else plugins=yes - subdirs="$subdirs contrib/plugins" fi fi @@ -1708,7 +1707,6 @@ LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit LINKS="$LINKS tests/avocado tests/data" LINKS="$LINKS tests/qemu-iotests/check tests/qemu-iotests/Makefile" LINKS="$LINKS python" -LINKS="$LINKS contrib/plugins/Makefile " for f in $LINKS ; do if [ -e "$source_path/$f" ]; then symlink "$source_path/$f" "$f" @@ -1794,22 +1792,6 @@ if test "$default_targets" = "yes"; then echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak fi -# contrib/plugins configuration -echo "# Automatically generated by configure - do not modify" > contrib/plugins/$config_host_mak -echo "SRC_PATH=$source_path/contrib/plugins" >> contrib/plugins/$config_host_mak -echo "PKG_CONFIG=${pkg_config}" >> contrib/plugins/$config_host_mak -echo "CC=$cc $CPU_CFLAGS" >> contrib/plugins/$config_host_mak -echo "CFLAGS=${CFLAGS-$default_cflags} $EXTRA_CFLAGS" >> contrib/plugins/$config_host_mak -if test "$host_os" = windows; then - echo "DLLTOOL=$dlltool" >> contrib/plugins/$config_host_mak -fi -if test "$host_os" = darwin; then - echo "CONFIG_DARWIN=y" >> contrib/plugins/$config_host_mak -fi -if test "$host_os" = windows; then - echo "CONFIG_WIN32=y" >> contrib/plugins/$config_host_mak -fi - # tests/tcg configuration mkdir -p tests/tcg echo "# Automatically generated by configure - do not modify" > tests/tcg/$config_host_mak diff --git a/Makefile b/Makefile index 917c9a34d1..b65b0bd41a 100644 --- a/Makefile +++ b/Makefile @@ -187,11 +187,6 @@ SUBDIR_RULES=$(foreach t, all clean distclean, $(addsuffix /$(t), $(SUBDIRS))) $(SUBDIR_RULES): $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),) -ifneq ($(filter contrib/plugins, $(SUBDIRS)),) -.PHONY: plugins -plugins: contrib/plugins/all -endif - .PHONY: recurse-all recurse-clean recurse-all: $(addsuffix /all, $(SUBDIRS)) recurse-clean: $(addsuffix /clean, $(SUBDIRS)) @@ -307,11 +302,6 @@ help: $(call print-help,cscope,Generate cscope index) $(call print-help,sparse,Run sparse on the QEMU source) @echo '' -ifneq ($(filter contrib/plugins, $(SUBDIRS)),) - @echo 'Plugin targets:' - $(call print-help,plugins,Build the example TCG plugins) - @echo '' -endif @echo 'Cleaning targets:' $(call print-help,clean,Remove most generated files but keep the config) $(call print-help,distclean,Remove all generated files) diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile deleted file mode 100644 index bbddd4800f..0000000000 --- a/contrib/plugins/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -# -*- Mode: makefile -*- -# -# This Makefile example is fairly independent from the main makefile -# so users can take and adapt it for their build. We only really -# include config-host.mak so we don't have to repeat probing for -# programs that the main configure has already done for us. -# - -include config-host.mak - -TOP_SRC_PATH = $(SRC_PATH)/../.. - -VPATH += $(SRC_PATH) - -NAMES := -NAMES += bbv -NAMES += execlog -NAMES += hotblocks -NAMES += hotpages -NAMES += howvec - -# The lockstep example communicates using unix sockets, -# and can't be easily made to work on windows. -ifneq ($(CONFIG_WIN32),y) -NAMES += lockstep -endif - -NAMES += hwprofile -NAMES += cache -NAMES += drcov -NAMES += ips -NAMES += stoptrigger -NAMES += cflow - -ifeq ($(CONFIG_WIN32),y) -SO_SUFFIX := .dll -LDLIBS += $(shell $(PKG_CONFIG) --libs glib-2.0) -else -SO_SUFFIX := .so -endif - -SONAMES := $(addsuffix $(SO_SUFFIX),$(addprefix lib,$(NAMES))) - -# The main QEMU uses Glib extensively so it is perfectly fine to use it -# in plugins (which many example do). -PLUGIN_CFLAGS := $(shell $(PKG_CONFIG) --cflags glib-2.0) -PLUGIN_CFLAGS += -fPIC -Wall -PLUGIN_CFLAGS += -I$(TOP_SRC_PATH)/include/qemu - -# Helper that honours V=1 so we get some output when compiling -quiet-@ = $(if $(V),,@$(if $1,printf " %-7s %s\n" "$(strip $1)" "$(strip $2)" && )) -quiet-command = $(call quiet-@,$2,$3)$1 - -# for including , in command strings -COMMA := , - -all: $(SONAMES) - -%.o: %.c - $(call quiet-command, \ - $(CC) $(CFLAGS) $(PLUGIN_CFLAGS) -c -o $@ $<, \ - BUILD, plugin $@) - -ifeq ($(CONFIG_WIN32),y) -lib%$(SO_SUFFIX): %.o win32_linker.o ../../plugins/libqemu_plugin_api.a - $(call quiet-command, \ - $(CC) -shared -o $@ $^ $(LDLIBS), \ - LINK, plugin $@) -else ifeq ($(CONFIG_DARWIN),y) -lib%$(SO_SUFFIX): %.o - $(call quiet-command, \ - $(CC) -bundle -Wl$(COMMA)-undefined$(COMMA)dynamic_lookup -o $@ $^ $(LDLIBS), \ - LINK, plugin $@) -else -lib%$(SO_SUFFIX): %.o - $(call quiet-command, \ - $(CC) -shared -o $@ $^ $(LDLIBS), \ - LINK, plugin $@) -endif - - -clean distclean: - rm -f *.o *$(SO_SUFFIX) *.d - rm -Rf .libs - -.PHONY: all clean -.SECONDARY: