From nobody Mon Feb 9 07:05:45 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=1596743545; cv=none; d=zohomail.com; s=zohoarc; b=N9gtGwrA/bOMsGETh86xyCRumz9Tf8HF6v+01fNUFxsvCqOI3N2QHprkq7cYYTNVH3bwKffvQx22N955CEFcTLMaFxCJR0foRFuIMrdqg4IANpF2YiV/4jLWNFaEhyxFl2JPzVSb+LVbqZSGksqTnWlg4oKjJaiW39FPn1lF4ks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596743545; 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=A9hI4Ze5jUncLYuHr2oKBvH4CYKaDNgLkBHdCA49jHM=; b=Uyhb+acDGIYZ+G5E82x98+xQDxCI4fLNmRbncuNaD+BWLKgadHgeo3yYMAo73FBNAq+B9+r9LO80Hd0te1z8n7vzzS5QwT/bKe8Dhu3AZE5xayIw5+ZBugdXnNsZL8dwgS9v8HjD2TgTaUU3WoaVoCXSm7uSW/ytjtmZ9UVtQRs= 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 1596743545682473.4666397535342; Thu, 6 Aug 2020 12:52:25 -0700 (PDT) Received: from localhost ([::1]:36524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3lw8-0001Nk-6E for importer@patchew.org; Thu, 06 Aug 2020 15:52:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3lPY-0007Qe-IV for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:18:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:34453 helo=us-smtp-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 1k3lPW-0006fr-9w for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:18:44 -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-145-pL1UuROoM3GB2f3Gwn_iWg-1; Thu, 06 Aug 2020 15:18:39 -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 09A648014C1 for ; Thu, 6 Aug 2020 19:18:39 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 193585F9DC; Thu, 6 Aug 2020 19:18:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596741521; 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=A9hI4Ze5jUncLYuHr2oKBvH4CYKaDNgLkBHdCA49jHM=; b=iRCNyIoBoFFUgT25oTQbG9S1vfzRpzKa6b7y1rvf+VAi2SW9KkNsTJwcEO0z61D67qMIGx KDDSm2b7tJEYX4fxXpOfWbLrJulysvRrqAZ8EHzAHofAeuQoj5AxpfZaxUxRHzbYcMc5Go z1ClTTF3AYNzh5Z3UmJa2W5XYC9Lu70= X-MC-Unique: pL1UuROoM3GB2f3Gwn_iWg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 078/143] meson: convert fsdev/ Date: Thu, 6 Aug 2020 21:15:14 +0200 Message-Id: <1596741379-12902-79-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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/06 03:10:56 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, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 | 4 +--- fsdev/Makefile.objs | 12 ------------ fsdev/meson.build | 10 ++++++++++ 3 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 fsdev/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index 65b0ae6..79812c4 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -38,9 +38,7 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS # single QEMU executable should support all CPUs and machines. =20 ifeq ($(CONFIG_SOFTMMU),y) -common-obj-$(CONFIG_LINUX) =3D fsdev/ - -common-obj-y +=3D accel/ +common-obj-y =3D accel/ =20 common-obj-$(CONFIG_AUDIO_ALSA) +=3D audio-alsa$(DSOSUF) common-obj-$(CONFIG_AUDIO_OSS) +=3D audio-oss$(DSOSUF) diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs deleted file mode 100644 index 42cd70c..0000000 --- a/fsdev/Makefile.objs +++ /dev/null @@ -1,12 +0,0 @@ -# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. -# only pull in the actual 9p backend if we also enabled virtio or xen. -ifeq ($(CONFIG_FSDEV_9P),y) -common-obj-y =3D qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o -else -common-obj-y =3D qemu-fsdev-dummy.o -endif -common-obj-y +=3D qemu-fsdev-opts.o qemu-fsdev-throttle.o - -# Toplevel always builds this; targets without virtio will put it in -# common-obj-y -common-obj-$(CONFIG_ALL) +=3D qemu-fsdev-dummy.o diff --git a/fsdev/meson.build b/fsdev/meson.build index d0daa2a..656dff6 100644 --- a/fsdev/meson.build +++ b/fsdev/meson.build @@ -1,3 +1,13 @@ +fsdev_ss =3D ss.source_set() +fsdev_ss.add(files('qemu-fsdev-opts.c', 'qemu-fsdev-throttle.c')) +fsdev_ss.add(when: 'CONFIG_ALL', if_true: files('qemu-fsdev-dummy.c')) +fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files( + '9p-iov-marshal.c', + '9p-marshal.c', + 'qemu-fsdev.c', +), if_false: files('qemu-fsdev-dummy.c')) +softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss) + have_virtfs_proxy_helper =3D have_tools and libattr.found() and libcap_ng.= found() and 'CONFIG_VIRTFS' in config_host if have_virtfs_proxy_helper executable('virtfs-proxy-helper', files('virtfs-proxy-helper.c', '9p-mar= shal.c', '9p-iov-marshal.c'), --=20 1.8.3.1