[PATCH] target/ppc/cpu.h: Remove duplicate includes

BALATON Zoltan posted 1 patch 4 years, 2 months ago
Test docker-quick@centos7 passed
Test FreeBSD passed
Test docker-mingw@fedora passed
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200212223207.5A37574637F@zero.eik.bme.hu
Maintainers: David Gibson <david@gibson.dropbear.id.au>
target/ppc/cpu.h | 2 --
1 file changed, 2 deletions(-)
[PATCH] target/ppc/cpu.h: Remove duplicate includes
Posted by BALATON Zoltan 4 years, 2 months ago
Commit 74433bf083b added some includes but added them twice. Since
these are guarded against multiple inclusion including them once is
enough.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
 target/ppc/cpu.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 3a1eb76004..07dd2b4da7 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -23,8 +23,6 @@
 #include "qemu/int128.h"
 #include "exec/cpu-defs.h"
 #include "cpu-qom.h"
-#include "exec/cpu-defs.h"
-#include "cpu-qom.h"
 
 /* #define PPC_EMULATE_32BITS_HYPV */
 
-- 
2.21.1


Re: [PATCH] target/ppc/cpu.h: Remove duplicate includes
Posted by Philippe Mathieu-Daudé 4 years, 2 months ago
On 2/12/20 11:26 PM, BALATON Zoltan wrote:
> Commit 74433bf083b added some includes but added them twice. Since
> these are guarded against multiple inclusion including them once is
> enough.
> 
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> ---
>   target/ppc/cpu.h | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index 3a1eb76004..07dd2b4da7 100644
> --- a/target/ppc/cpu.h
> +++ b/target/ppc/cpu.h
> @@ -23,8 +23,6 @@
>   #include "qemu/int128.h"
>   #include "exec/cpu-defs.h"
>   #include "cpu-qom.h"
> -#include "exec/cpu-defs.h"
> -#include "cpu-qom.h"
>   
>   /* #define PPC_EMULATE_32BITS_HYPV */

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>


Re: [PATCH] target/ppc/cpu.h: Remove duplicate includes
Posted by David Gibson 4 years, 2 months ago
On Wed, Feb 12, 2020 at 11:26:14PM +0100, BALATON Zoltan wrote:
> Commit 74433bf083b added some includes but added them twice. Since
> these are guarded against multiple inclusion including them once is
> enough.
> 
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>

Applied to ppc-for-5.0, thanks.

> ---
>  target/ppc/cpu.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index 3a1eb76004..07dd2b4da7 100644
> --- a/target/ppc/cpu.h
> +++ b/target/ppc/cpu.h
> @@ -23,8 +23,6 @@
>  #include "qemu/int128.h"
>  #include "exec/cpu-defs.h"
>  #include "cpu-qom.h"
> -#include "exec/cpu-defs.h"
> -#include "cpu-qom.h"
>  
>  /* #define PPC_EMULATE_32BITS_HYPV */
>  

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson