From nobody Tue Dec 16 08:31:37 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597082932; cv=none; d=zohomail.com; s=zohoarc; b=ImHTF3UFbpxH0soFAbj/vRH3pNVJZtoRegG6QpZrD3OIskYmw3ZqniZRiYYsdzBBDWET4Fcx0/pcd8Dtx7k4+DacNuOj7R7Kwhy4Zn35jSd7rO6/XjNo8mohZHssdb5ysAt9qZMD0p27wQM7nAIDLi5rV2wIuG1JXaLNBlakm4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597082932; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=s31xm4JAuFhjhN3htnKViDYE1BgESjhYQhCECa8DNG0=; b=NmtHkso+6NQSS7XwJOhlfULVXG50qMg+jBZPo6FAFhgIlx4AmKPiBEowEFDyCB3eOkYthi3IMhs2cLYVIGDN/+ORUDB0Uytjl1pImFAdUi2BmQqraXL1aB66lowBDAc7oyB9WJmkWR86pPbtGswO21PkmneIsDzXbTOPk4YSMXA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597082932053825.3365669534645; Mon, 10 Aug 2020 11:08:52 -0700 (PDT) Received: from localhost ([::1]:58600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5CE6-0003Ab-Rt for importer@patchew.org; Mon, 10 Aug 2020 14:08:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BM7-0003pG-4k for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5BM5-0003OP-1K for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:13:02 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-124-2MZYqA0hOOanrTdXZRR7Zw-1; Mon, 10 Aug 2020 13:12:58 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C72EC80183C for ; Mon, 10 Aug 2020 17:12:57 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 197CB5F1E9 for ; Mon, 10 Aug 2020 17:12:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=s31xm4JAuFhjhN3htnKViDYE1BgESjhYQhCECa8DNG0=; b=VnjpwvNesLwuFtnF0fVczumD315YK+zZ4IoflH4Reo8qwoY8AGEKbnaHhJx9zdE//432x7 TVvSLGKHaITMaGmbxSjMIulgTfA+cQKXTcKzJXE50p4Hw+XcVD2ifEqpN4qTZlivLrEAqO ufQwHboP4At6ctecrtAiLFaojvFsE/g= X-MC-Unique: 2MZYqA0hOOanrTdXZRR7Zw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 140/147] meson: convert sample plugins Date: Mon, 10 Aug 2020 19:08:58 +0200 Message-Id: <1597079345-42801-141-git-send-email-pbonzini@redhat.com> In-Reply-To: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> References: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 13:09:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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, URIBL_BLOCKED=0.001 autolearn=ham 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: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- configure | 4 ---- tests/Makefile.include | 9 --------- tests/meson.build | 3 +++ tests/plugin/Makefile | 46 --------------------------------------------= -- tests/plugin/meson.build | 7 +++++++ 5 files changed, 10 insertions(+), 59 deletions(-) delete mode 100644 tests/plugin/Makefile create mode 100644 tests/plugin/meson.build diff --git a/configure b/configure index 5d57990..ee32003 100755 --- a/configure +++ b/configure @@ -6825,9 +6825,6 @@ echo "GIT_UPDATE=3D$git_update" >> $config_host_mak =20 echo "ARCH=3D$ARCH" >> $config_host_mak =20 -echo "GLIB_CFLAGS=3D$glib_cflags" >> $config_host_mak -echo "GLIB_LDFLAGS=3D$glib_ldflags" >> $config_host_mak - if test "$default_devices" =3D "yes" ; then echo "CONFIG_MINIKCONF_MODE=3D--defconfig" >> $config_host_mak else @@ -8312,7 +8309,6 @@ DIRS=3D"$DIRS roms/seabios" LINKS=3D"Makefile" LINKS=3D"$LINKS tests/tcg/lm32/Makefile po/Makefile" LINKS=3D"$LINKS tests/tcg/Makefile.target" -LINKS=3D"$LINKS tests/plugin/Makefile" LINKS=3D"$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps" LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" LINKS=3D"$LINKS roms/seabios/Makefile" diff --git a/tests/Makefile.include b/tests/Makefile.include index e023df8..aec293b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -429,15 +429,6 @@ check-speed: $(check-speed-y) check-report-unit.tap: $(check-unit-y) $(call do_test_tap,$^) =20 -# Plugins -ifeq ($(CONFIG_PLUGIN),y) -.PHONY: plugins -plugins: - $(call quiet-command,\ - $(MAKE) $(SUBDIR_MAKEFLAGS) -C tests/plugin V=3D"$(V)", \ - "BUILD", "plugins") -endif - # Per guest TCG tests =20 BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) diff --git a/tests/meson.build b/tests/meson.build index f834c27..fe2c6d8 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -9,6 +9,9 @@ test('decodetree', sh, =20 if 'CONFIG_TCG' in config_host subdir('fp') + if 'CONFIG_PLUGIN' in config_host + subdir('plugin') + endif endif =20 subdir('qapi-schema') diff --git a/tests/plugin/Makefile b/tests/plugin/Makefile deleted file mode 100644 index e9348fd..0000000 --- a/tests/plugin/Makefile +++ /dev/null @@ -1,46 +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 -# cflags that the main configure has already done for us. -# - -BUILD_DIR :=3D $(CURDIR)/../.. - -include $(BUILD_DIR)/config-host.mak - -VPATH +=3D $(SRC_PATH)/tests/plugin - -NAMES :=3D -NAMES +=3D bb -NAMES +=3D empty -NAMES +=3D insn -NAMES +=3D mem -NAMES +=3D hotblocks -NAMES +=3D howvec -NAMES +=3D hotpages -NAMES +=3D lockstep - -SONAMES :=3D $(addsuffix .so,$(addprefix lib,$(NAMES))) - -# The main QEMU uses Glib extensively so it's perfectly fine to use it -# in plugins (which many example do). -CFLAGS =3D $(GLIB_CFLAGS) -CFLAGS +=3D -fPIC -CFLAGS +=3D $(if $(findstring no-psabi,$(QEMU_CFLAGS)),-Wpsabi) -CFLAGS +=3D -I$(SRC_PATH)/include/qemu - -all: $(SONAMES) - -%.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< - -lib%.so: %.o - $(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDLIBS) - -clean: - rm -f *.o *.so *.d - rm -Rf .libs - -.PHONY: all clean diff --git a/tests/plugin/meson.build b/tests/plugin/meson.build new file mode 100644 index 0000000..dbbdcba --- /dev/null +++ b/tests/plugin/meson.build @@ -0,0 +1,7 @@ +t =3D [] +foreach i : ['bb', 'empty', 'insn', 'mem', 'hotblocks', 'howvec', 'hotpage= s', 'lockstep'] + t +=3D shared_module(i, files(i + '.c'), + include_directories: '../../include/qemu', + dependencies: glib) +endforeach +alias_target('plugins', t) --=20 1.8.3.1