From nobody Mon Feb 9 02:51:56 2026 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=1596743433; cv=none; d=zohomail.com; s=zohoarc; b=TdkMuPrDvPI/a1nPM0ZOt+ZKgdANBTkbf0SCFa/irumA6DNWMPC0YvSLxNPlHToI/7Y5Ha3rP0Ss7uxR3l4deWX13xAsiWhF54riRMBqAjPRSrz2x3d2iI7hb7xb2GBfuVr+bb7LOVOfbLKH821lq7wMTO3LTARakHV3tqLBXGM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596743433; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oZ085/aeR2z1+BOPKTwsEhaR2W9Xh3eyDTl1aE3nrYQ=; b=a+AAIfc6wPA5FKnENat2W1ZrDf87n9uJJLk09qI5jSTN8mEkn166xI3j80lb+HU5M/YSsGzk6FtA89VC6j5yuD28FIbqO1TWG4ZO8fwQ82WLctrcVU3fuqOBuPrDeofZbNOz/T1J5Nb68MNpLxJEkXr0QSV89r8Vop8ZZ6pFyrw= 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 1596743433145555.3405832761301; Thu, 6 Aug 2020 12:50:33 -0700 (PDT) Received: from localhost ([::1]:55186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3luJ-0005fb-O3 for importer@patchew.org; Thu, 06 Aug 2020 15:50:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3lPX-0007MY-1P for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:18:43 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:45269 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k3lPU-0006fn-UK for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:18:42 -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-336-Mbnr7loXOe6v6PoJSGyPuQ-1; Thu, 06 Aug 2020 15:18:38 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A234B1DE1 for ; Thu, 6 Aug 2020 19:18:37 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 283DF5F9DC; Thu, 6 Aug 2020 19:18:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596741520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oZ085/aeR2z1+BOPKTwsEhaR2W9Xh3eyDTl1aE3nrYQ=; b=MuGcFPNaYvztCB2EdDn5M5dwcTOtJ59znM6RhieDmoAOn0BJwMBW6acdEs9VFwhBig1u7c pTVhx2eUGiCH2Qd4ipjPFAnQF3yy0KEVsWdNEx47GtKZ9PtCGMmsRyai1SM4exs5I9/1+n mPqLCn8raNf5Q/jC2Ik1OTO7x7Z5G9Y= X-MC-Unique: Mbnr7loXOe6v6PoJSGyPuQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 077/143] meson: convert backends directory to Meson Date: Thu, 6 Aug 2020 21:15:13 +0200 Message-Id: <1596741379-12902-78-git-send-email-pbonzini@redhat.com> In-Reply-To: <1596741379-12902-1-git-send-email-pbonzini@redhat.com> References: <1596741379-12902-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/06 00:07:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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, RCVD_IN_MSPIKE_H2=-1, 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile.objs | 2 -- backends/Makefile.objs | 23 ----------------------- backends/meson.build | 19 +++++++++++++++++++ backends/tpm/Makefile.objs | 4 ---- backends/tpm/meson.build | 8 ++++++++ configure | 2 ++ meson.build | 5 +++++ 7 files changed, 34 insertions(+), 29 deletions(-) delete mode 100644 backends/Makefile.objs create mode 100644 backends/meson.build delete mode 100644 backends/tpm/Makefile.objs create mode 100644 backends/tpm/meson.build diff --git a/Makefile.objs b/Makefile.objs index 8e73682..65b0ae6 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -65,8 +65,6 @@ common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) += =3D block-dmg-bz2$(DSOSUF common-obj-y +=3D hw/ common-obj-m +=3D hw/ =20 -common-obj-y +=3D backends/ - common-obj-y +=3D qapi/ =20 common-obj-y +=3D libqmp.fa diff --git a/backends/Makefile.objs b/backends/Makefile.objs deleted file mode 100644 index 22d204c..0000000 --- a/backends/Makefile.objs +++ /dev/null @@ -1,23 +0,0 @@ -common-obj-y +=3D rng.o rng-egd.o rng-builtin.o -common-obj-$(CONFIG_POSIX) +=3D rng-random.o - -common-obj-$(CONFIG_TPM) +=3D tpm/ - -common-obj-y +=3D hostmem.o hostmem-ram.o -common-obj-$(CONFIG_POSIX) +=3D hostmem-file.o - -common-obj-y +=3D cryptodev.o -common-obj-y +=3D cryptodev-builtin.o - -ifeq ($(CONFIG_VIRTIO_CRYPTO),y) -common-obj-y +=3D cryptodev-vhost.o -common-obj-$(CONFIG_VHOST_CRYPTO) +=3D cryptodev-vhost-user.o -endif - -common-obj-$(call land,$(CONFIG_VHOST_USER),$(CONFIG_VIRTIO)) +=3D vhost-u= ser.o - -common-obj-$(CONFIG_LINUX) +=3D hostmem-memfd.o - -common-obj-$(CONFIG_GIO) +=3D dbus-vmstate.o -dbus-vmstate.o-cflags =3D $(GIO_CFLAGS) -dbus-vmstate.o-libs =3D $(GIO_LIBS) diff --git a/backends/meson.build b/backends/meson.build new file mode 100644 index 0000000..484456e --- /dev/null +++ b/backends/meson.build @@ -0,0 +1,19 @@ +softmmu_ss.add([files( + 'cryptodev-builtin.c', + 'cryptodev.c', + 'hostmem-ram.c', + 'hostmem.c', + 'rng-builtin.c', + 'rng-egd.c', + 'rng.c', +), numa]) + +softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files('rng-random.c')) +softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files('hostmem-file.c')) +softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('hostmem-memfd.c')) +softmmu_ss.add(when: ['CONFIG_VHOST_USER', 'CONFIG_VIRTIO'], if_true: file= s('vhost-user.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vho= st.c')) +softmmu_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VHOST_CRYPTO'], if_t= rue: files('cryptodev-vhost-user.c')) +softmmu_ss.add(when: 'CONFIG_GIO', if_true: [files('dbus-vmstate.c'), gio]) + +subdir('tpm') diff --git a/backends/tpm/Makefile.objs b/backends/tpm/Makefile.objs deleted file mode 100644 index db2731f..0000000 --- a/backends/tpm/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -common-obj-y +=3D tpm_backend.o -common-obj-y +=3D tpm_util.o -common-obj-$(CONFIG_TPM_PASSTHROUGH) +=3D tpm_passthrough.o -common-obj-$(CONFIG_TPM_EMULATOR) +=3D tpm_emulator.o diff --git a/backends/tpm/meson.build b/backends/tpm/meson.build new file mode 100644 index 0000000..8579290 --- /dev/null +++ b/backends/tpm/meson.build @@ -0,0 +1,8 @@ +tpm_ss =3D ss.source_set() + +tpm_ss.add(files('tpm_backend.c')) +tpm_ss.add(files('tpm_util.c')) +tpm_ss.add(when: 'CONFIG_TPM_PASSTHROUGH', if_true: files('tpm_passthrough= .c')) +tpm_ss.add(when: 'CONFIG_TPM_EMULATOR', if_true: files('tpm_emulator.c')) + +softmmu_ss.add_all(when: 'CONFIG_TPM', if_true: tpm_ss) diff --git a/configure b/configure index e99af16..96ba99f 100755 --- a/configure +++ b/configure @@ -4675,6 +4675,7 @@ EOF if compile_prog "" "-lnuma" ; then numa=3Dyes libs_softmmu=3D"-lnuma $libs_softmmu" + numa_libs=3D"-lnuma" else if test "$numa" =3D "yes" ; then feature_not_found "numa" "install numactl devel" @@ -8309,6 +8310,7 @@ fi =20 if test "$numa" =3D "yes"; then echo "CONFIG_NUMA=3Dy" >> $config_host_mak + echo "NUMA_LIBS=3D$numa_libs" >> $config_host_mak fi =20 if test "$ccache_cpp2" =3D "yes"; then diff --git a/meson.build b/meson.build index 73ad78d..77c0df6 100644 --- a/meson.build +++ b/meson.build @@ -304,6 +304,10 @@ rdma =3D not_found if 'CONFIG_RDMA' in config_host rdma =3D declare_dependency(link_args: config_host['RDMA_LIBS'].split()) endif +numa =3D not_found +if 'CONFIG_NUMA' in config_host + numa =3D declare_dependency(link_args: config_host['NUMA_LIBS'].split()) +endif =20 create_config =3D find_program('scripts/create_config') minikconf =3D find_program('scripts/minikconf.py') @@ -641,6 +645,7 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [fi= les('device_tree.c')]) common_ss.add(files('cpus-common.c')) =20 subdir('softmmu') +subdir('backends') subdir('migration') subdir('monitor') subdir('net') --=20 1.8.3.1