Re: [RFC v6 12/13] target/s390x: move kvm files into kvm/

[Thomas Huth]

On 29/06/2021 16.19, Cho, Yu-Chen wrote:
> move kvm files into kvm/
> After the reshuffling, update MAINTAINERS accordingly.
> Make use of the new directory:
>
> target/s390x/kvm/
>
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> Signed-off-by: Cho, Yu-Chen <acho@suse.com>
> ---
[...]
> diff --git a/meson.build b/meson.build
> index a91b39465c..293d509c7e 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1886,6 +1886,7 @@ if have_system or have_user
>       'target/ppc',
>       'target/riscv',
>       'target/s390x',
> +    'target/s390x/kvm',

You've added this to the "have_system or have_user" section ... however, I 
think the KVM code should not be required at all if compiling with 
--disable-system, since the linux-user builds require TCG only.

So it might be cleaner to add this in the "if have_system" section instead?

>       'target/sparc',
>     ]
>   endif
[...]
> diff --git a/target/s390x/kvm.c b/target/s390x/kvm/kvm.c
> similarity index 99%
> rename from target/s390x/kvm.c
> rename to target/s390x/kvm/kvm.c
> index 5b1fdb55c4..07dae06de8 100644
> --- a/target/s390x/kvm.c
> +++ b/target/s390x/kvm/kvm.c
> @@ -27,7 +27,7 @@
>   #include "qemu-common.h"
>   #include "cpu.h"
>   #include "s390x-internal.h"
> -#include "kvm_s390x.h"
> +#include "kvm/kvm_s390x.h"

No need to add the kvm/ prefix here since the file is in the same folder.

 Thomas