From patchwork Wed Sep 25 20:48:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 830485 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1374:b0:367:895a:4699 with SMTP id q20csp938154wrz; Wed, 25 Sep 2024 13:50:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUj4wvD7ZfYL3D2zV7DD3h0qmYcSuTE+NNZoikXN+LVxdX4uwX0fha/0cllmlokhn3ye6i8Vg==@linaro.org X-Google-Smtp-Source: AGHT+IGF+d+JPgRnQ+eSD573mXePX4W5xgvD4yc4fRx2m7VxhBf1rp2kEj5IT8EzvVnORm6bleEs X-Received: by 2002:ac8:5885:0:b0:458:697c:94b with SMTP id d75a77b69052e-45b5def30fbmr50378771cf.34.1727297418684; Wed, 25 Sep 2024 13:50:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727297418; cv=none; d=google.com; s=arc-20240605; b=bCFPUlXAH1Ni5Gt0tmgjrmDsHAJaNC0FrHAbZDBvp4GHx6qAji24BW8iaw+7NE7qSO VHZ2y1BZUu7bW/WXWrDn6JFb6OgL2e6FAOTWpr4pxUOJi5HDeRELWJ2XlVmJ+QuRQ9JD PbT9AWo+zW43cRizLVf5ylWz/nSOUI8jeFyTf5ORORxY9wqsb17m4+6Y39DBzTxNVboM pbMg/9lYmw7VawQQ2M8XaSdJYha7bXhXn7WnqTtOPVclcdvoyyNShDiZPOAxr95cLqlu ww1m47RP/OsmEBWRFCKKC1/d1/tdmk5qJS4OvetIolN75AmuOl3gmcXWUpR+ky2vwXH6 hKOA== 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=W0oYs/D0tpaNOcC705VbLE/UauOtsZZGp/Aj1Bwa1e8=; fh=ElfVJ0WJTGk8vzaHUUPcIoe1bAggW/mMs9haJd48S2k=; b=HnW+942XauNinV5tE/i6LeXm3QhDdrAdPPi/JD6o8hK0h9elrxFOUQdteW9nUBoJfg MKbW8wJnNZ4cwcITpzx7dSPY9Gss4GymAM0yuf44BNHE13cqni0H7NPVfMN/Y9GZGN5M kuxtld36gQJF6Jzy9hl0DAKGtTlpeZlXVPWWLck5tMfONOM+AYiwUi7mom/NbA0I4fTR Pe7wV6sNdO0lXQIpVLS+DeM/WQj7zOblQR+M28etfocTlOpMTeB2FWThVxAf7mmR8EMk aS/FwT2IgqOQXjrjmyzE4jAIHph9R9AGtgF8LdveaFzvumoCwk51BCqJqub1cU6XNfWb z4Fg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DmPaRb77; 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 d75a77b69052e-45b5274baabsi49197391cf.706.2024.09.25.13.50.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Sep 2024 13:50:18 -0700 (PDT) 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=DmPaRb77; 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 1stYwW-0005cS-EU; Wed, 25 Sep 2024 16:49:00 -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 1stYwU-0005b3-Bu for qemu-devel@nongnu.org; Wed, 25 Sep 2024 16:48:58 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stYwS-0006bO-Lx for qemu-devel@nongnu.org; Wed, 25 Sep 2024 16:48:58 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-20b0b2528d8so2195225ad.2 for ; Wed, 25 Sep 2024 13:48:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1727297335; x=1727902135; 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=W0oYs/D0tpaNOcC705VbLE/UauOtsZZGp/Aj1Bwa1e8=; b=DmPaRb777pqCpRhKXr/QbFpZXfMz5usaCplbFPLUcwfsmYXfpxPKZHW7Y681P6Mc+t fVClkVfLYRubqnD0/055UNhVHTkZiblDrxBJF0Of0XEUBnRU+GfchBA8OlUlUhEP+Piv ej/Ut1wd6TROXXj1bUI/qICcopBRRVD//bKBHemuovjz8a/D18u2aUee/Y1zdIVs2/ww Zf8Gh9Ci7F0GL+DyM6hGjtlunTzJSviJDkSiL7bitX1b0vpeEEutuKCOKKZNV6EHECNv RYucLWG5pPZOj8ohpTwvxyhMBL2y3Xq/EEK+NMN+mVWxdGhpVpuo4bpXzfDtJye4ODiK /wIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727297335; x=1727902135; 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=W0oYs/D0tpaNOcC705VbLE/UauOtsZZGp/Aj1Bwa1e8=; b=jqaJTyMa4+D50Ac/p4xBzngfzBgqbnXv2WkfKMWKPwr9xa5HAiLS7MtJ8lTxQMN8Zg fYyl7AGKNUu7v+MfhhBJh/tHDwRK4iP+Ie5tH1irjP2JX+8xvohl/evodIVtu2zDllls JDh85VEg21D8ec1hygy8cwwlA/h5w9EKUSajMfx5qog+OrBbR1HpMbPrbn+1dTIT/mli nkqPB+dMrLyFrNbCgB9kiNlx7szfjnB3838n8W6Ipr5/jwdMpVI0L6mm48EdBECuu7Nr 7jXoV7eynu8bEGReekQzrSGtSeMWqlDy8e4qJXu+754JSA9juOLmpAngym3sDJP+qHLZ W5bA== X-Gm-Message-State: AOJu0Yz3Bd+AKbQRQvw7XSrrLnYWT/n0aqo+f0wr3SiYd7jac8cPgi3y taL/yVr9JIzARoAA0vzV8gNnMjtMZilI7WryYnpg75+eYixkBuqi9ZmMzrP52WvH4Qm6y3M1Kko EmjkxXNcM X-Received: by 2002:a17:902:d501:b0:20b:f6e:a823 with SMTP id d9443c01a7336-20b0f6eabb2mr28611755ad.22.1727297334809; Wed, 25 Sep 2024 13:48:54 -0700 (PDT) Received: from linaro.. (216-180-64-156.dyn.novuscom.net. [216.180.64.156]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20af16e6ce6sm27991435ad.19.2024.09.25.13.48.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 13:48:54 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Pierrick Bouvier , Alexandre Iooss , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Mahmoud Mandour Subject: [PATCH v2 1/2] meson: build contrib/plugins with meson Date: Wed, 25 Sep 2024 13:48:44 -0700 Message-Id: <20240925204845.390689-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240925204845.390689-1-pierrick.bouvier@linaro.org> References: <20240925204845.390689-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62a.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, 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 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 | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 contrib/plugins/meson.build diff --git a/meson.build b/meson.build index ceee6b22c8d..b18c2a54ab5 100644 --- a/meson.build +++ b/meson.build @@ -3655,6 +3655,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..a0e026d25e2 --- /dev/null +++ b/contrib/plugins/meson.build @@ -0,0 +1,23 @@ +t = [] +if get_option('plugins') + foreach i : ['cache', 'drcov', 'execlog', 'hotblocks', 'hotpages', 'howvec', + 'hwprofile', 'ips', 'lockstep', 'stoptrigger'] + 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 Sep 25 20:48:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 830483 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1374:b0:367:895a:4699 with SMTP id q20csp938067wrz; Wed, 25 Sep 2024 13:49:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXju/w/ogux4x+aCW7u1k7mZgevYhzzfRdu5dr+E9O7n+v7U9FkWypN98R4EaPlcgavn7MtzA==@linaro.org X-Google-Smtp-Source: AGHT+IGNtaXSlhmm5blMD/d2REB4fd5s1n1QViKfjMiXMmrD9KVKT/kROlrhoyIsC7Fp7yD7IBpC X-Received: by 2002:a05:622a:48c:b0:456:8ee8:f5f1 with SMTP id d75a77b69052e-45b5def2847mr62372631cf.31.1727297394946; Wed, 25 Sep 2024 13:49:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727297394; cv=none; d=google.com; s=arc-20240605; b=RAhyDWOFPLYLwXOtI7haHfkxRn3dJ3yP4KvZqBwMh7j6wFIIopD1uEvIbcg8TPGKQl +yUimxnQBLnmBGI9zfvKILiqhEKgnKsisPPWglScMtv8V5HyFUmv+Gt3VHqE/efdYkI7 GTUIEEdHFR8QcGqEXeTtzYvElX4lALmLd3goAFC9xVooZoSp1x5Y76VkF7Vw9h51UQi9 xK/XO8RxK8yyueIo2daCzBaMtxWIPuBKOhAJNFMX3/427sxtgTaTTiKfPzLDMKmcKMpX UhuKAhs2ZRfPuHP9QT3x5v49ilA2XHx4puB6yEz6vQ2qsYYvdvfkbukvd/+1KC9PmDGz KDgQ== 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=6vz+n8YKrUeBpEvMnJmtLUsCHAoDtzXyPZgp/oilgYs=; fh=ElfVJ0WJTGk8vzaHUUPcIoe1bAggW/mMs9haJd48S2k=; b=R6EDopyckdf9Kxffsx5SErvzof7QuPdyqto4Ck/v4xmTaiJXEoG8zyUw9QhzXBuKHp kkz8uER3jVDE8KBPiflyi2BiM9ERUVhrDN/uueP9TD/EZziQKsmmy+kQXBrOq0RqX/sA JK5VIiBol1V9UFWwNn4xlfZTCg85E1t4/QEKJuGIprw5HC249JFzZ9yCuxCqa1Fn5NVN mGdy8L5yda3XIGB/ZKQwSo8AXUr31CGx5imUpnchp4/RejbbWG2McAxyPJSWAOOFXwFR zoEWhNzMD2HCQeGXrm8QdN0+YxPi5qMZDz/4B6X+I8+QhXojLY2nvs7DgbiNpqHKdtFX zZMA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZwIjNguZ; 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 d75a77b69052e-45b5256edcesi45419751cf.96.2024.09.25.13.49.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Sep 2024 13:49:54 -0700 (PDT) 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=ZwIjNguZ; 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 1stYwY-0005ia-CL; Wed, 25 Sep 2024 16:49:02 -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 1stYwV-0005c7-S8 for qemu-devel@nongnu.org; Wed, 25 Sep 2024 16:48:59 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stYwT-0006bZ-63 for qemu-devel@nongnu.org; Wed, 25 Sep 2024 16:48:59 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-208e0a021cfso1995515ad.0 for ; Wed, 25 Sep 2024 13:48:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1727297336; x=1727902136; 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=6vz+n8YKrUeBpEvMnJmtLUsCHAoDtzXyPZgp/oilgYs=; b=ZwIjNguZlaQcwHWKOjrD2XLj+UQaMm4c/uqizq+O1E+ZTbiOzlihjiJ8klMJ4jXoyY KSHQEOwuIDQ6/pDwuSKqL+5yfaFWUey/BIVfXyw4nYoP507TSAZCiNuoGOnCRbXnXybA N44UVam1muvyqMCqFR8WVCBFnfz+M0+pBENBK5R75QiY2htJzfxHFbosqCIAIVTXUbnD Gn8s4sxdSzHKs/GfwcUzBRsQFBYGGLqyIsCHXppCXHkQI8MTHaVPrSUKoPFJxUJegGpB xu1AZtFZ/2UHn7GdqpnyBRLPNcJi4qbRLqv0aB6PWxmg9pGReZj2yUaeFaj4A1TS/a0U OCgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727297336; x=1727902136; 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=6vz+n8YKrUeBpEvMnJmtLUsCHAoDtzXyPZgp/oilgYs=; b=F1Vun6CJNsCmKYNciCE76lgJjJ1nKg8cEICtFndcIxh5O6m40we5ZpMKQygreeb0Ph VCNVysxYfRiodBTzukcO6hg7Op9w4pWHlN9rQZzJ1Jil9Atzt4affudY4CSIPtaD/tWj +daP9GX4llUIwMHF+wgPZDlJBwcRH5Hpt19uZY8BYdfhjfQMFZqDEytugwOGg3J0qzsE 8kJwrxynEDW/WIqdMrky3Lr8abfvKy8tZntFBphR5VK0cj7mUh+KWovpva98wpl7ppoD WNR0W/VPYPSJsVHof0O8kJCAy5KZvYM0b8zFj1RUFJW22NYOlK2/FxGhBsH4RWb994qx F8TQ== X-Gm-Message-State: AOJu0YyWCdGn1Uv4ADJii06msLzeheJ2r2ihPYznZ2wl10EHhjTpv4+z 9jI1feg8mb8BFpsWAx6/meA13RMEkEZmYblNF3TBvU5hycDMvkEgqFBiyTPNvvmgz0DThMZJtTG OWe+JNsPj X-Received: by 2002:a17:903:22cb:b0:205:9220:aa37 with SMTP id d9443c01a7336-20afc45b075mr42668765ad.22.1727297335689; Wed, 25 Sep 2024 13:48:55 -0700 (PDT) Received: from linaro.. (216-180-64-156.dyn.novuscom.net. [216.180.64.156]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20af16e6ce6sm27991435ad.19.2024.09.25.13.48.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 13:48:55 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Pierrick Bouvier , Alexandre Iooss , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Mahmoud Mandour Subject: [PATCH v2 2/2] contrib/plugins: remove Makefile for contrib/plugins Date: Wed, 25 Sep 2024 13:48:45 -0700 Message-Id: <20240925204845.390689-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240925204845.390689-1-pierrick.bouvier@linaro.org> References: <20240925204845.390689-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x636.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, 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 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 aa7aae70fa1..934336e5286 100755 --- a/configure +++ b/configure @@ -1055,7 +1055,6 @@ if test "$plugins" != "no" && test $host_bits -eq 64; then plugins="no" else plugins=yes - subdirs="$subdirs contrib/plugins" fi fi @@ -1555,7 +1554,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" @@ -1638,22 +1636,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: