Re: [PATCH v3 02/11] 9p: Rename 9p-util -> 9p-util-linux

[Greg Kurz <groug@kaod.org>]

On Thu, 27 Jan 2022 19:56:02 -0500
Will Cohen <wwcohen@gmail.com> wrote:

> From: Keno Fischer <keno@juliacomputing.com>
> 
> The current file only has the Linux versions of these functions.
> Rename the file accordingly and update the Makefile to only build
> it on Linux. A Darwin version of these will follow later in the
> series.
> 
> Signed-off-by: Keno Fischer <keno@juliacomputing.com>
> [Michael Roitzsch: - Rebase for NixOS]
> Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com>
> Signed-off-by: Will Cohen <wwcohen@gmail.com>
> ---

Reviewed-by: Greg Kurz <groug@kaod.org>

>  hw/9pfs/{9p-util.c => 9p-util-linux.c} | 2 +-
>  hw/9pfs/meson.build                    | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>  rename hw/9pfs/{9p-util.c => 9p-util-linux.c} (97%)
> 
> diff --git a/hw/9pfs/9p-util.c b/hw/9pfs/9p-util-linux.c
> similarity index 97%
> rename from hw/9pfs/9p-util.c
> rename to hw/9pfs/9p-util-linux.c
> index 3221d9b498..398614a5d0 100644
> --- a/hw/9pfs/9p-util.c
> +++ b/hw/9pfs/9p-util-linux.c
> @@ -1,5 +1,5 @@
>  /*
> - * 9p utilities
> + * 9p utilities (Linux Implementation)
>   *
>   * Copyright IBM, Corp. 2017
>   *
> diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build
> index 99be5d9119..1b28e70040 100644
> --- a/hw/9pfs/meson.build
> +++ b/hw/9pfs/meson.build
> @@ -4,7 +4,6 @@ fs_ss.add(files(
>    '9p-posix-acl.c',
>    '9p-proxy.c',
>    '9p-synth.c',
> -  '9p-util.c',
>    '9p-xattr-user.c',
>    '9p-xattr.c',
>    '9p.c',
> @@ -14,6 +13,7 @@ fs_ss.add(files(
>    'coth.c',
>    'coxattr.c',
>  ))
> +fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c'))
>  fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c'))
>  softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss)
>