common-user: Only compile the common user code if have_user is set

[PATCH] common-user: Only compile the common user code if have_user is set

Posted by Thomas Huth 1 year, 10 months ago

There is no need to waste cycles here if we only compile the system
binaries or tools. Additionally, this change is even a hard requirement
for building the tools on systems that do not have an entry in the
common-user/host/ folder (since common-user/meson.build is trying
to add such a path via the include_directories() command).

Reported-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 common-user/meson.build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common-user/meson.build b/common-user/meson.build
index 26212dda5c..ac9de5b9e3 100644
--- a/common-user/meson.build
+++ b/common-user/meson.build
@@ -1,3 +1,7 @@
+if not have_user
+   subdir_done()
+endif
+
 common_user_inc += include_directories('host/' / host_arch)
 
 user_ss.add(files(
-- 
2.31.1

Re: [PATCH] common-user: Only compile the common user code if have_user is set

Posted by Laurent Vivier 1 year, 10 months ago

Le 22/06/2022 à 16:03, Thomas Huth a écrit :
> There is no need to waste cycles here if we only compile the system
> binaries or tools. Additionally, this change is even a hard requirement
> for building the tools on systems that do not have an entry in the
> common-user/host/ folder (since common-user/meson.build is trying
> to add such a path via the include_directories() command).
> 
> Reported-by: Michael Tokarev <mjt@tls.msk.ru>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   common-user/meson.build | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/common-user/meson.build b/common-user/meson.build
> index 26212dda5c..ac9de5b9e3 100644
> --- a/common-user/meson.build
> +++ b/common-user/meson.build
> @@ -1,3 +1,7 @@
> +if not have_user
> +   subdir_done()
> +endif
> +
>   common_user_inc += include_directories('host/' / host_arch)
>   
>   user_ss.add(files(

Applied to my trivial-patches branch.

Thanks,
Laurent

RE: [PATCH] common-user: Only compile the common user code if have_user is set

Posted by Zhang, Chen 1 year, 10 months ago


> -----Original Message-----
> From: Qemu-devel <qemu-devel-
> bounces+chen.zhang=intel.com@nongnu.org> On Behalf Of Thomas Huth
> Sent: Wednesday, June 22, 2022 10:03 PM
> To: qemu-devel@nongnu.org; Riku Voipio <riku.voipio@iki.fi>
> Cc: Michael Tokarev <mjt@tls.msk.ru>; qemu-trivial@nongnu.org; Paolo
> Bonzini <pbonzini@redhat.com>
> Subject: [PATCH] common-user: Only compile the common user code if
> have_user is set
> 
> There is no need to waste cycles here if we only compile the system binaries
> or tools. Additionally, this change is even a hard requirement for building the
> tools on systems that do not have an entry in the common-user/host/ folder
> (since common-user/meson.build is trying to add such a path via the
> include_directories() command).
> 
> Reported-by: Michael Tokarev <mjt@tls.msk.ru>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Looks good to me.
Reviewed-by: Zhang Chen <chen.zhang@intel.com>

> ---
>  common-user/meson.build | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/common-user/meson.build b/common-user/meson.build index
> 26212dda5c..ac9de5b9e3 100644
> --- a/common-user/meson.build
> +++ b/common-user/meson.build
> @@ -1,3 +1,7 @@
> +if not have_user
> +   subdir_done()
> +endif
> +
>  common_user_inc += include_directories('host/' / host_arch)
> 
>  user_ss.add(files(
> --
> 2.31.1
>