From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7793FC433F5 for ; Sat, 9 Oct 2021 14:41:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CFF3060F5A for ; Sat, 9 Oct 2021 14:41:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CFF3060F5A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:57258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZDXo-0004vu-SN for qemu-devel@archiver.kernel.org; Sat, 09 Oct 2021 10:41:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZDWN-0003yx-3q for qemu-devel@nongnu.org; Sat, 09 Oct 2021 10:40:19 -0400 Received: from mail-vk1-xa35.google.com ([2607:f8b0:4864:20::a35]:45621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mZDWK-0000PV-BQ for qemu-devel@nongnu.org; Sat, 09 Oct 2021 10:40:18 -0400 Received: by mail-vk1-xa35.google.com with SMTP id n201so4664075vkn.12 for ; Sat, 09 Oct 2021 07:40:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=tdo+lPR8l6EZ1T7PCFWd+Rx4pjCGe7jlE+x6J5GJAy8=; b=OvELH0WMV+TL/pu6YegHoEBCKjpvZ6KoZmp1uDYnn419LqTnmGO+7vuhPRVLOBmygL +HyL6foc3ndbGn6JLG8iM6/P3UIK4RNPnK+PcZAajRALM9ac8vKS9AhLvZ2yGI3LZi3x /cXGd7MWOxLv5B90oDUlWDgDAdqSYu4ys7kZ0HYgQ54ORhbS1E7XZ288dF/ChX+vou0u LeXaXAz8xSS78NlV5n8+13LU3MaAFm4fuEOzPKMTivmg93XbSKncNK+3BUaZhkFJXxwo 2fjN6PwgFOnXGb/+Hu/9Mo+xIxRvY7AneN5hgDWrqYaTUKxJwjOWjjf9BSiOwkUXy9Fj R+qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=tdo+lPR8l6EZ1T7PCFWd+Rx4pjCGe7jlE+x6J5GJAy8=; b=2twQ6ugqP1Q6Ri2Lw4budpsENbBBWlhohDvNZetrINllKnx8VnYgUjglkknEZ+t7Ar RsbQsWlqYehjVC/M7dPY0xYNslgesyCxW9RwTIsWd8p1ymQ0+NXhLbUpKR6zw5aUbX76 7W3KbvDzyJZwGiZmWP5dtVPW+V/yCb6wqrIh+VWHoNH5hdMyH3UyU95DmvcldnPVXOlC RXuMaGhfCprUYLbBbReVxdIEgD6R4GEy82pzZOHtFr6CKlYkYGrI3EhckAvFsu9Rbmwi tsJgOL2HIa4FXkRkJWhC/bDKManu4PRjBQZ5wVErnxsUaEnepnDBftAftbWWc/5FKwXL XKPg== X-Gm-Message-State: AOAM533bbmX5f2rKV/uoNrO5LNn3Hqhhb1y9O1NGjdjx5t9g8YAxzD3r iV2zmeVYQz/bG1h/++ZXskeKVLL8dRgcxPNUmow6DxIG+Bk= X-Google-Smtp-Source: ABdhPJz6SyYqrE5hsRQFh319PJCY/slAKZItpPeA31nyGINWT8x6+gqRyCSW+/RzCOPLq3Mc51gIAXApGMJsVlBoMQc= X-Received: by 2002:a1f:2d83:: with SMTP id t125mr14259319vkt.23.1633790413832; Sat, 09 Oct 2021 07:40:13 -0700 (PDT) MIME-Version: 1.0 References: <20211008231506.17471-1-imp@bsdimp.com> <20211008231506.17471-2-imp@bsdimp.com> In-Reply-To: <20211008231506.17471-2-imp@bsdimp.com> From: Warner Losh Date: Sat, 9 Oct 2021 08:40:03 -0600 Message-ID: Subject: Re: [PATCH v2 01/15] meson: *-user: only descend into *-user when configured To: QEMU Developers Content-Type: multipart/alternative; boundary="00000000000041141c05cdec79e2" Received-SPF: none client-ip=2607:f8b0:4864:20::a35; envelope-from=wlosh@bsdimp.com; helo=mail-vk1-xa35.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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: Kyle Evans , Paolo Bonzini , Richard Henderson , Laurent Vivier , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --00000000000041141c05cdec79e2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable (looks like Paolo's email bounced, so try again with cut and paste) On Fri, Oct 8, 2021 at 5:15 PM Warner Losh wrote: > To increase flexibility, only descend into *-user when that is > configured. This allows *-user to selectively include directories based > on the host OS which may not exist on all hosts. Adopt Paolo's > suggestion of checking the configuration in the directories that know > about the configuration. > > Message-Id: <20210926220103.1721355-2-f4bug@amsat.org> > Message-Id: <20210926220103.1721355-3-f4bug@amsat.org> > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > Signed-off-by: Warner Losh > Acked-by: Paolo Bonzini > > Sponsored by: Netflix > --- > bsd-user/meson.build | 4 ++++ > linux-user/meson.build | 4 ++++ > meson.build | 3 +-- > 3 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/bsd-user/meson.build b/bsd-user/meson.build > index 0369549340..243fb78930 100644 > --- a/bsd-user/meson.build > +++ b/bsd-user/meson.build > @@ -1,3 +1,7 @@ > +if not config_target.has_key('CONFIG_BSD_USER') > + subdir_done() > +endif > + > bsd_user_ss.add(files( > 'bsdload.c', > 'elfload.c', > diff --git a/linux-user/meson.build b/linux-user/meson.build > index 9549f81682..602255a3d6 100644 > --- a/linux-user/meson.build > +++ b/linux-user/meson.build > @@ -1,3 +1,7 @@ > +if not config_target.has_key('CONFIG_LINUX_USER') > + subdir_done() > +endif > + > linux_user_ss.add(files( > 'elfload.c', > 'exit.c', > diff --git a/meson.build b/meson.build > index 99a0a3e689..1f2da5f7d9 100644 > --- a/meson.build > +++ b/meson.build > @@ -2303,10 +2303,9 @@ subdir('ebpf') > > common_ss.add(libbpf) > > -bsd_user_ss.add(files('gdbstub.c')) > specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss) > > -linux_user_ss.add(files('gdbstub.c', 'thunk.c')) > +linux_user_ss.add(files('thunk.c')) > specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss) > > # needed for fuzzing binaries > -- > 2.32.0 > > --00000000000041141c05cdec79e2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
(looks like Paolo's email bounced, so try again with c= ut and paste)

On Fri, Oct 8, 2021 at 5:15 PM Warner Losh <imp@bsdimp.com> wrote:
To increase flexibility, only descend into= *-user when that is
configured. This allows *-user to selectively include directories based
on the host OS which may not exist on all hosts. Adopt Paolo's
suggestion of checking the configuration in the directories that know
about the configuration.

Message-Id: <20210926220103.1721355-2-f4bug@amsat.org>
Message-Id: <20210926220103.1721355-3-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Signed-off-by: Warner Losh <wlosh@bsdimp.com>
Acked-by: Paolo Bonzini <pbonzinni@redhat.com>

Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Netflix
---
=C2=A0bsd-user/meson.build=C2=A0 =C2=A0| 4 ++++
=C2=A0linux-user/meson.build | 4 ++++
=C2=A0meson.build=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 3 +--
=C2=A03 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bsd-user/meson.build b/bsd-user/meson.build
index 0369549340..243fb78930 100644
--- a/bsd-user/meson.build
+++ b/bsd-user/meson.build
@@ -1,3 +1,7 @@
+if not config_target.has_key('CONFIG_BSD_USER')
+=C2=A0 =C2=A0subdir_done()
+endif
+
=C2=A0bsd_user_ss.add(files(
=C2=A0 =C2=A0'bsdload.c',
=C2=A0 =C2=A0'elfload.c',
diff --git a/linux-user/meson.build b/linux-user/meson.build
index 9549f81682..602255a3d6 100644
--- a/linux-user/meson.build
+++ b/linux-user/meson.build
@@ -1,3 +1,7 @@
+if not config_target.has_key('CONFIG_LINUX_USER')
+=C2=A0 =C2=A0subdir_done()
+endif
+
=C2=A0linux_user_ss.add(files(
=C2=A0 =C2=A0'elfload.c',
=C2=A0 =C2=A0'exit.c',
diff --git a/meson.build b/meson.build
index 99a0a3e689..1f2da5f7d9 100644
--- a/meson.build
+++ b/meson.build
@@ -2303,10 +2303,9 @@ subdir('ebpf')

=C2=A0common_ss.add(libbpf)

-bsd_user_ss.add(files('gdbstub.c'))
=C2=A0specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_use= r_ss)

-linux_user_ss.add(files('gdbstub.c', 'thunk.c'))
+linux_user_ss.add(files('thunk.c'))
=C2=A0specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux= _user_ss)

=C2=A0# needed for fuzzing binaries
--
2.32.0

--00000000000041141c05cdec79e2--