From patchwork Wed Oct 23 21:28:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 13847987 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8D574CFA47F for ; Wed, 23 Oct 2024 21:29:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3iu2-0000nc-0y; Wed, 23 Oct 2024 17:28:27 -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 1t3itz-0000ml-PM for qemu-devel@nongnu.org; Wed, 23 Oct 2024 17:28:23 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0: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 1t3ity-0007cp-Ad for qemu-devel@nongnu.org; Wed, 23 Oct 2024 17:28:23 -0400 Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-7e9e38dd5f1so157384a12.0 for ; Wed, 23 Oct 2024 14:28:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1729718901; x=1730323701; 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=fYFstZ300Z1RMHxxN1v3kF2XX3UeGjweCaXeStNcbZ4=; b=SKtdMHxMTlR2eazkK+VY9Mm1JeTQtUDgaOxWoa0Js4+WonIBEwNW2AmIorK0QOvNkU GVdyD8zJyxdyH5MztShFjQof4zjjIkgSy1cXD+IVEMjFbgmledpwYiqyLy9ILVIRVWqM kI6zVp9wN4L/GrfiRt+bRRJ14OUWunFz5ssd2ykzp1z/ky03RKaQTLBJO7AD+jjHwFRD T4IcyQTGLYsbZ1XWZtS1MurhCkHqCFCyXG3w7N3YnuiqfzMDd5LOJOiqyC5AtSi09Zo2 PueEUmAAD4mIozywBPfHEMSq5AQXYfdYosd1d0/xPP0CXCxI00r/TtxxLGifKPasJbn8 VMsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718901; x=1730323701; 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=fYFstZ300Z1RMHxxN1v3kF2XX3UeGjweCaXeStNcbZ4=; b=Mz6R3OnoW9oDPxqaotK7kFOasZfxORQvwYVgjtKU+iCjLkzP3MRSC02Zzc9idpn4zO qBJkj7V88d+QLsj5L4P2KUnbIOZU/y+x61pWjCV3UunD3iQYjG6jN+cNWs5o4sWaNxKX oLGnX9ixwBIxTN2S0DWxpUrdSCGH63DYjsWip3VXGHdBLoifwzbrg/+D1pclLp7MNxBP yqggLCmQ8frHSO0svZaq4GNYgWhKmQcwYZO0CPpP3ZBClFmYPZdkec2OCJX5C1gDb7SJ jn8uzfbxe1HshUj4a2N1Ip6UVeriVa8XtCKDfnga4vc0GjksxRwvS5a0rEy67M7/U5+/ SjEw== X-Gm-Message-State: AOJu0YzlHKFwZR+COlo1xcIUlYY7jM86XCfAAL/wJp6rw45xtZsCJVwi 5Vbunkd4F/oJ66VIVrWfao2d9tcoRx7zVNa0ffVpcfO72vibbeHeD25hKY6qntXpq1r8uTMjPHA a3n9jVQ== X-Google-Smtp-Source: AGHT+IHN/2vSsO/glVdl1/GTorHaQjw1brMmKD2uF2L8aDy4EJ3pWpMOVzr2ydMx1ysUyErGiuu6Wg== X-Received: by 2002:a05:6a20:d8a:b0:1d9:2994:ca27 with SMTP id adf61e73a8af0-1d978bad9bamr4254073637.36.1729718900844; Wed, 23 Oct 2024 14:28:20 -0700 (PDT) Received: from linaro.. (216-180-64-156.dyn.novuscom.net. [216.180.64.156]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7eaeaafab5esm7228137a12.17.2024.10.23.14.28.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:28:20 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pierrick Bouvier , Alexandre Iooss , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , Mahmoud Mandour Subject: [PATCH v3 1/3] contrib/plugins/cflow: fix warning Date: Wed, 23 Oct 2024 14:28:10 -0700 Message-Id: <20241023212812.1376972-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241023212812.1376972-1-pierrick.bouvier@linaro.org> References: <20241023212812.1376972-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 --- contrib/plugins/cflow.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/plugins/cflow.c b/contrib/plugins/cflow.c index 6faa55d10d1..b39974d1cf3 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 Wed Oct 23 21:28:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 13847989 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8ACA0CFA47E for ; Wed, 23 Oct 2024 21:29:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3iu3-0000np-OE; Wed, 23 Oct 2024 17:28:31 -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 1t3iu0-0000n1-Mz for qemu-devel@nongnu.org; Wed, 23 Oct 2024 17:28:24 -0400 Received: from mail-il1-x12a.google.com ([2607:f8b0:4864:20::12a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t3ity-0007cv-Sg for qemu-devel@nongnu.org; Wed, 23 Oct 2024 17:28:24 -0400 Received: by mail-il1-x12a.google.com with SMTP id e9e14a558f8ab-3a4dacfda3eso1083595ab.2 for ; Wed, 23 Oct 2024 14:28:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1729718902; x=1730323702; 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=AlBPxw/KrsdqzVVePdKmZM4R4b6YL6msvYP62z27iUY=; b=xNqVJKpE1VuyB82Pw0udfAJbbS+CTUHPsVJdnkXRv38sbx/XnWpUVi68a6G/bkLgLp fToE6HGmD+KT53f3OVUdctobGIRYpVF76ZMLudqjyy4SHtuqCXSQ4c80PLdtLGgaA9x1 nvu82y/E/2t1PiXfyYJYyO5M3G8HAqEpqk/Awlw06zC8cv0y1SLFisSfsKJ5Sywrdgjy IC/W9Mo0NCPeMziq9XQ7mDtUN1LeRQlW/xs7eOZl+zbduoKZjw9CudKjVruWoDkoeOUO CQCGUApS9kQbz9a/MSexvzhboQcktpHevd+FOiaDoTsA2/tHuTxs+DZOMpHyUbSnkIH0 mACw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718902; x=1730323702; 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=AlBPxw/KrsdqzVVePdKmZM4R4b6YL6msvYP62z27iUY=; b=SQVWmQBqE4rsqiDdN4lxm5A/a65wxXei5XdW+4NRkvxK6loEJQWEpxdfk3Edn0vvbx I5GX1oK2af6RCoFnEUl9/OXd5CPK5baxzwKUrrN85WsJLo/jpYHWOo9eGRlSCwPy8c7B erLwdoFSEAKqeYEoocVLwCHZh3i5Qqjg6C1uuAe/tDqje41ULvsCnCz47Q9gjlHmlHlD R2N5zb2LnjaCMKqwRBHHc/oFrUZfTi006gncEKUgkh2osog9mfZyDULR0ztPOev+ILTY g+5hwjyFrd6gtyFs5CrZgyK384+wZiBtZE5ueJUVRsM8Ze/3T77GmQ2CeIr7uGyl7fQY pKPQ== X-Gm-Message-State: AOJu0YyIEk41V1dBhH/ebcw7eoGnckxE+iJJEb0fZ3fbE9KW6+5y1sMD 1aVDIHTleknmR48SC7KfuN/tllkcXqXwZ/J1NAwlB8TV+Tb+AXw5IGTiTb/40ZiP//LOPV2a8Tg 6bcSs2A== X-Google-Smtp-Source: AGHT+IFtStuVyRB27pK5J0eIsrodHevjtPaNOZ57Ia9cOZ8iSHPb9DUTY3eiP/pN7RRVfekVLuEQeA== X-Received: by 2002:a05:6e02:164d:b0:3a0:9238:d38 with SMTP id e9e14a558f8ab-3a4d5961cccmr42474985ab.10.1729718901676; Wed, 23 Oct 2024 14:28:21 -0700 (PDT) Received: from linaro.. (216-180-64-156.dyn.novuscom.net. [216.180.64.156]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7eaeaafab5esm7228137a12.17.2024.10.23.14.28.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:28:21 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pierrick Bouvier , Alexandre Iooss , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , Mahmoud Mandour Subject: [PATCH v3 2/3] meson: build contrib/plugins with meson Date: Wed, 23 Oct 2024 14:28:11 -0700 Message-Id: <20241023212812.1376972-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241023212812.1376972-1-pierrick.bouvier@linaro.org> References: <20241023212812.1376972-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12a; envelope-from=pierrick.bouvier@linaro.org; helo=mail-il1-x12a.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 --- meson.build | 4 ++++ contrib/plugins/meson.build | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 contrib/plugins/meson.build diff --git a/meson.build b/meson.build index bdd67a2d6d1..3ea03c451ba 100644 --- a/meson.build +++ b/meson.build @@ -3678,6 +3678,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 00000000000..63a32c2b4f0 --- /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 Wed Oct 23 21:28:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 13847988 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8F221CDDE69 for ; Wed, 23 Oct 2024 21:29:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3iu8-0000o0-Ui; Wed, 23 Oct 2024 17:28:33 -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 1t3iu1-0000nf-TV for qemu-devel@nongnu.org; Wed, 23 Oct 2024 17:28:25 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t3iu0-0007d6-0P for qemu-devel@nongnu.org; Wed, 23 Oct 2024 17:28:25 -0400 Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-7ed67cfc1fcso137477a12.1 for ; Wed, 23 Oct 2024 14:28:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1729718902; x=1730323702; 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=JjDoBTrz22e33mOfB2cbwwFtf5EJUlD0swdssSX+JS8=; b=GWBl75htXy8+TX3YumT9h1W3PjgC1bZZXqIi+GmIBIAzHrW/a/HQqjYelvILoxBc2G YZ7aQZWFVPceSUQ2YT34kuE2lH3mOKR2KIjZEj3W7z2rWcdg3Ibhdlt3H0gGGd2y+BQv SraIG+NH7HmV8NIFbbQx4l5ra5QMT3EOQKd2KoU/8CpTZOq2x/XPTDRSjiQ70v8lJ6HU 3KP4Z0eB+ew6fyiWOOyC1kyaj26R4kqD4tb0nDkiptWsuIz75bwhVQTPKVRgwHBMOLtN wPNLrY8jCBsTt78oERNZz852NSLb8R3X2LtlpVgAKtUQ7PgH3wF242TUuFv4dqRa9pn+ MhYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718902; x=1730323702; 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=JjDoBTrz22e33mOfB2cbwwFtf5EJUlD0swdssSX+JS8=; b=B3CRiPKSmRFhFgsaSQRHVVCTYIJIlfoDn2XsPJglUViTAVA/JzhDVstii3BgkvtWL6 2qnbUZTO2b70pXPTIXGXwCMzW2X00m7XaeUrnK42XErZM/URPYimf5vfvSFeZmAtlEnJ hMYP9mlzaqpcGB0CkEzT4FSGdAWc2o65BZAthF7DbuLvw3T3YzRADuIGwJ7HgXTvcr2x 3lgR5DPe6JjRXTzUJCXhlRhbWvLPnc+nG7h02ho6xFWkpYHW4vLDhSdhQzFAEJO79JEO cA661p/5nYVJhkX+vjSw4NgWWTqoAfxLERgSlGjLQnNMuByRXIn/NJDELIRF0MVdFkVL smgQ== X-Gm-Message-State: AOJu0YygpwhmfoIV4kOnaTKvE8V8oHnrXQgR+OBigpUo0cfa8nVvbJeg dugPkHJWHHupjD+qAJMZGI1g0cMCmKlOEbTOvcuoFW5xg7JkUOw6uUg206/9YZX6fa/mwd20Moh tdmmKOg== X-Google-Smtp-Source: AGHT+IHZkQt8sP0/MaN/ffi89jTmLQLdOn3N+dWAOYN14lHLM/nGmTQIcc6mya0DXfptP6IM4FLDCg== X-Received: by 2002:a05:6a21:1707:b0:1d2:f09e:c15b with SMTP id adf61e73a8af0-1d978b3e44cmr5010913637.25.1729718902538; Wed, 23 Oct 2024 14:28:22 -0700 (PDT) Received: from linaro.. (216-180-64-156.dyn.novuscom.net. [216.180.64.156]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7eaeaafab5esm7228137a12.17.2024.10.23.14.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:28:22 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pierrick Bouvier , Alexandre Iooss , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , Mahmoud Mandour Subject: [PATCH v3 3/3] contrib/plugins: remove Makefile for contrib/plugins Date: Wed, 23 Oct 2024 14:28:12 -0700 Message-Id: <20241023212812.1376972-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241023212812.1376972-1-pierrick.bouvier@linaro.org> References: <20241023212812.1376972-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pg1-x531.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Now replaced by meson build. Signed-off-by: Pierrick Bouvier --- configure | 18 --------- Makefile | 10 ----- contrib/plugins/Makefile | 87 ---------------------------------------- 3 files changed, 115 deletions(-) delete mode 100644 contrib/plugins/Makefile diff --git a/configure b/configure index 72d1a942250..d23587c77dc 100755 --- a/configure +++ b/configure @@ -1073,7 +1073,6 @@ if test "$plugins" != "no" && test $host_bits -eq 64; then plugins="no" else plugins=yes - subdirs="$subdirs contrib/plugins" fi fi @@ -1699,7 +1698,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" @@ -1785,22 +1783,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 917c9a34d1c..b65b0bd41a8 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 bbddd4800ff..00000000000 --- 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: