Re: [PATCH 14/21] target/arm/kvm: Merge kvm64.c into kvm.c

[Philippe Mathieu-Daudé]

Hi Richard,

On 23/11/23 05:42, Richard Henderson wrote:
> Since kvm32.c was removed, there is no need to keep them separate.
> This will allow more symbols to be unexported.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   target/arm/kvm.c       | 789 +++++++++++++++++++++++++++++++++++++++
>   target/arm/kvm64.c     | 820 -----------------------------------------
>   target/arm/meson.build |   2 +-
>   3 files changed, 790 insertions(+), 821 deletions(-)
>   delete mode 100644 target/arm/kvm64.c

Reviewed using 'git-diff --color-moved=dimmed-zebra'.

> diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
> deleted file mode 100644
> index 52c0a6d3af..0000000000
> --- a/target/arm/kvm64.c
> +++ /dev/null
> @@ -1,820 +0,0 @@
> -/*
> - * ARM implementation of KVM hooks, 64 bit specific code
> - *
> - * Copyright Mian-M. Hamayun 2013, Virtual Open Systems
> - * Copyright Alex Bennée 2014, Linaro
> - *
> - * This work is licensed under the terms of the GNU GPL, version 2 or later.
> - * See the COPYING file in the top-level directory.
> - *
> - */

IANAL but shouldn't we keep these (c) lines? As:

-- >8 --
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 7903e2ddde..b8fc1c8d87 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -2,6 +2,8 @@
  * ARM implementation of KVM hooks
  *
  * Copyright Christoffer Dall 2009-2010
+ * Copyright Mian-M. Hamayun 2013, Virtual Open Systems
+ * Copyright Alex Bennée 2014, Linaro
  *
  * This work is licensed under the terms of the GNU GPL, version 2 or 
later.
  * See the COPYING file in the top-level directory.
---

Otherwise,

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>