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: 837825 Delivered-To: patch@linaro.org Received: by 2002:adf:a399:0:b0:37d:45d0:187 with SMTP id l25csp44056wrb; Wed, 23 Oct 2024 14:29:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW12AoiB3UAW7Q1pExigtU2yrlKwGjig3c79ozMJkdxM+yqkGPRwlhJIRcfQT/DzsPPeTSipg==@linaro.org X-Google-Smtp-Source: AGHT+IG3tlQJusj2GvTEv/WZVnmZpXsqy5jP5O+f0UCdcA7zmQ/ndqSwfd106LzqaO21xOO5m4fP X-Received: by 2002:a05:6830:4985:b0:718:12af:c89b with SMTP id 46e09a7af769-7184b288561mr4761582a34.1.1729718954483; Wed, 23 Oct 2024 14:29:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729718954; cv=none; d=google.com; s=arc-20240605; b=DrzbmWZkLKybJ83cRQXD4TotmUNmV5glYAoBzB22blXW2Ow5Kfpxfnv3r/mxppVUZE QVvLm7fRibXuDkHNbmWZGe6vT00g/DO/mE3e405/MT6/B3A+dzHzAOGwjGY2/naLePEJ O1zQNlwPlPkMNSpBGfBoMh51BEyzOOCewqsp3Y9go5T5RaC+UMFO85DvlOHJ+zCebZO7 VtnIESzw1yxk032tdB/ZczVY/vZFoxeTsew+Bi6aV3miFQJMPkSKM+fL0UNgptmkifLN 0eQcsC3m5EwOW6B8MrUcGSsO6mUOySyV6C8lFoUFSPZWOgxWWmFZW/gh6+pkNagvzWFj /g9w== 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=JjDoBTrz22e33mOfB2cbwwFtf5EJUlD0swdssSX+JS8=; fh=bcRMKJcfkonkiwGTYHppKOfk02CuaOwEhVTi+cv7RfA=; b=Vy4TYwLBwiJsDiuUPOgXlhdf2OSKtAwuWx0mttSjupUP1ygFSxwuXz5/irADWrxW6W XUm8R9OSRMlemiU5iyAtVIz1ug/zlD1V2b/V8P940lc3fc9j6lkEV1h+OIhnzKj06DUS Eet4lS16Pm0FI4uRyCkLhgSC7J8qK6KPO1+kz8j1CXlFhVOAPLgvUAFfqN8+4SaowfEY YxNHiv6x7HRaEbUIftRRQjhL3glttQ5PDy9/kWMxn/g2oCVlHuDS/TSWEbD9oS84CMxN a7DGufGAMKwL3Rt7eC0kcirME4pi+lwCBMj1zVUsdUp6BsS1MaiSVeFi3vtJJM5sAKoW 5cCw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GWBl75ht; 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-6ce0098b159si99889106d6.285.2024.10.23.14.29.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Oct 2024 14:29:14 -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=GWBl75ht; 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 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-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+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 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: