[PATCH 0/4] hw: Remove 'exec/exec-all.h' header when unused

[PATCH 0/4] hw: Remove 'exec/exec-all.h' header when unused

[Philippe Mathieu-Daudé]

Philippe Mathieu-Daudé (4):
  hw/ppc/spapr_hcall: Remove unused 'exec/exec-all.h' included header
  hw/misc/mips_itu: Remove unnecessary 'exec/exec-all.h' header
  hw/s390x/ipl: Remove unused 'exec/exec-all.h' included header
  target: Restrict 'sysemu/reset.h' to system emulation

 hw/misc/mips_itu.c     | 3 ++-
 hw/ppc/spapr_hcall.c   | 1 -
 hw/s390x/ipl.c         | 1 -
 target/i386/cpu.c      | 2 +-
 target/loongarch/cpu.c | 2 ++
 5 files changed, 5 insertions(+), 4 deletions(-)

-- 
2.41.0

[PATCH 1/4] hw/ppc/spapr_hcall: Remove unused 'exec/exec-all.h' included header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/ppc/spapr_hcall.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index 522a2396c7..fcefd1d1c7 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -8,7 +8,6 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "qemu/error-report.h"
-#include "exec/exec-all.h"
 #include "exec/tb-flush.h"
 #include "helper_regs.h"
 #include "hw/ppc/ppc.h"
-- 
2.41.0

[PATCH 2/4] hw/misc/mips_itu: Remove unnecessary 'exec/exec-all.h' header

[Philippe Mathieu-Daudé]

mips_itu.c only requires declarations from "hw/core/cpu.h"
and "cpu.h". Avoid including the huge "exec/exec-all.h" header.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/misc/mips_itu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c
index 5a83ccc4e8..37aea0e737 100644
--- a/hw/misc/mips_itu.c
+++ b/hw/misc/mips_itu.c
@@ -22,9 +22,10 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "exec/exec-all.h"
+#include "hw/core/cpu.h"
 #include "hw/misc/mips_itu.h"
 #include "hw/qdev-properties.h"
+#include "target/mips/cpu.h"
 
 #define ITC_TAG_ADDRSPACE_SZ (ITC_ADDRESSMAP_NUM * 8)
 /* Initialize as 4kB area to fit all 32 cells with default 128B grain.
-- 
2.41.0

[PATCH 3/4] hw/s390x/ipl: Remove unused 'exec/exec-all.h' included header

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/ipl.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 515dcf51b5..62182d81a0 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -35,7 +35,6 @@
 #include "qemu/cutils.h"
 #include "qemu/option.h"
 #include "standard-headers/linux/virtio_ids.h"
-#include "exec/exec-all.h"
 
 #define KERN_IMAGE_START                0x010000UL
 #define LINUX_MAGIC_ADDR                0x010008UL
-- 
2.41.0

[PATCH 4/4] target: Restrict 'sysemu/reset.h' to system emulation

[Philippe Mathieu-Daudé]

vCPU "reset" is only possible with system emulation.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Song Gao <gaosong@loongson.cn>
---
 target/i386/cpu.c      | 2 +-
 target/loongarch/cpu.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index dfb96217ad..17b6962d43 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -24,7 +24,6 @@
 #include "qemu/hw-version.h"
 #include "cpu.h"
 #include "tcg/helper-tcg.h"
-#include "sysemu/reset.h"
 #include "sysemu/hvf.h"
 #include "hvf/hvf-i386.h"
 #include "kvm/kvm_i386.h"
@@ -37,6 +36,7 @@
 #include "hw/qdev-properties.h"
 #include "hw/i386/topology.h"
 #ifndef CONFIG_USER_ONLY
+#include "sysemu/reset.h"
 #include "qapi/qapi-commands-machine-target.h"
 #include "exec/address-spaces.h"
 #include "hw/boards.h"
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index fc075952e6..b26187dfde 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -17,7 +17,9 @@
 #include "internals.h"
 #include "fpu/softfloat-helpers.h"
 #include "cpu-csr.h"
+#ifndef CONFIG_USER_ONLY
 #include "sysemu/reset.h"
+#endif
 #include "tcg/tcg.h"
 #include "vec.h"
 
-- 
2.41.0

Re: [PATCH 3/4] hw/s390x/ipl: Remove unused 'exec/exec-all.h' included header

[Christian Borntraeger]

Am 12.12.23 um 12:36 schrieb Philippe Mathieu-Daudé:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/s390x/ipl.c | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index 515dcf51b5..62182d81a0 100644
> --- a/hw/s390x/ipl.c
> +++ b/hw/s390x/ipl.c
> @@ -35,7 +35,6 @@
>   #include "qemu/cutils.h"
>   #include "qemu/option.h"
>   #include "standard-headers/linux/virtio_ids.h"
> -#include "exec/exec-all.h"

Philippe,

This include came with
commit a30fb811cbe940020a498d2cdac9326cac38b4d9
Author:     David Hildenbrand <david@redhat.com>
AuthorDate: Tue Apr 24 12:18:59 2018 +0200
Commit:     Cornelia Huck <cohuck@redhat.com>
CommitDate: Mon May 14 17:10:02 2018 +0200

     s390x: refactor reset/reipl handling

And I think one reason was

cpu_loop_exit

This is still part of ipl.c

a30fb811cbe (David Hildenbrand      2018-04-24 12:18:59 +0200 664)     /* as this is triggered by a CPU, make sure to exit the loop */
a30fb811cbe (David Hildenbrand      2018-04-24 12:18:59 +0200 665)     if (tcg_enabled()) {
a30fb811cbe (David Hildenbrand      2018-04-24 12:18:59 +0200 666)         cpu_loop_exit(cs);
a30fb811cbe (David Hildenbrand      2018-04-24 12:18:59 +0200 667)     }

So why do you think exec-all.h is unused?

Re: [PATCH 3/4] hw/s390x/ipl: Remove unused 'exec/exec-all.h' included header

[Eric Farman]

On Tue, 2023-12-12 at 14:08 +0100, Christian Borntraeger wrote:
> 
> 
> Am 12.12.23 um 12:36 schrieb Philippe Mathieu-Daudé:
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> > ---
> >   hw/s390x/ipl.c | 1 -
> >   1 file changed, 1 deletion(-)
> > 
> > diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> > index 515dcf51b5..62182d81a0 100644
> > --- a/hw/s390x/ipl.c
> > +++ b/hw/s390x/ipl.c
> > @@ -35,7 +35,6 @@
> >   #include "qemu/cutils.h"
> >   #include "qemu/option.h"
> >   #include "standard-headers/linux/virtio_ids.h"
> > -#include "exec/exec-all.h"
> 
> Philippe,
> 
> This include came with
> commit a30fb811cbe940020a498d2cdac9326cac38b4d9
> Author:     David Hildenbrand <david@redhat.com>
> AuthorDate: Tue Apr 24 12:18:59 2018 +0200
> Commit:     Cornelia Huck <cohuck@redhat.com>
> CommitDate: Mon May 14 17:10:02 2018 +0200
> 
>      s390x: refactor reset/reipl handling
> 
> And I think one reason was
> 
> cpu_loop_exit
> 
> This is still part of ipl.c
> 
> a30fb811cbe (David Hildenbrand      2018-04-24 12:18:59 +0200
> 664)     /* as this is triggered by a CPU, make sure to exit the loop
> */
> a30fb811cbe (David Hildenbrand      2018-04-24 12:18:59 +0200
> 665)     if (tcg_enabled()) {
> a30fb811cbe (David Hildenbrand      2018-04-24 12:18:59 +0200
> 666)         cpu_loop_exit(cs);
> a30fb811cbe (David Hildenbrand      2018-04-24 12:18:59 +0200
> 667)     }
> 
> So why do you think exec-all.h is unused?
> 
> 

I think because that got moved out of exec-all.h a few months ago, via

commit 3549118b498873c84b442bc280a5edafbb61e0a4
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date:   Thu Sep 14 20:57:08 2023 +0200

    exec: Move cpu_loop_foo() target agnostic functions to 'cpu-
common.h'
    
    While these functions are not TCG specific, they are not target
    specific. Move them to "exec/cpu-common.h" so their callers don't
    have to be tainted as target specific.

Re: [PATCH 3/4] hw/s390x/ipl: Remove unused 'exec/exec-all.h' included header

[Christian Borntraeger]

Am 12.12.23 um 16:28 schrieb Eric Farman:
>> So why do you think exec-all.h is unused?
>>
>>
> 
> I think because that got moved out of exec-all.h a few months ago, via
> 
> commit 3549118b498873c84b442bc280a5edafbb61e0a4
> Author: Philippe Mathieu-Daudé <philmd@linaro.org>
> Date:   Thu Sep 14 20:57:08 2023 +0200
> 
>      exec: Move cpu_loop_foo() target agnostic functions to 'cpu-
> common.h'
>      
>      While these functions are not TCG specific, they are not target
>      specific. Move them to "exec/cpu-common.h" so their callers don't
>      have to be tainted as target specific.
> 

Ah right, I was looking at an old QEMU version....

Re: [PATCH 3/4] hw/s390x/ipl: Remove unused 'exec/exec-all.h' included header

[Eric Farman]

On Tue, 2023-12-12 at 12:36 +0100, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  hw/s390x/ipl.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> 
Yup, this appears no longer relevant since commit 3549118b4988

Reviewed-by: Eric Farman <farman@linux.ibm.com>

Re: [PATCH 1/4] hw/ppc/spapr_hcall: Remove unused 'exec/exec-all.h' included header

[Thomas Huth]

On 12/12/2023 12.36, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/ppc/spapr_hcall.c | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index 522a2396c7..fcefd1d1c7 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -8,7 +8,6 @@
>   #include "qemu/main-loop.h"
>   #include "qemu/module.h"
>   #include "qemu/error-report.h"
> -#include "exec/exec-all.h"
>   #include "exec/tb-flush.h"
>   #include "helper_regs.h"
>   #include "hw/ppc/ppc.h"

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 2/4] hw/misc/mips_itu: Remove unnecessary 'exec/exec-all.h' header

[Thomas Huth]

On 12/12/2023 12.36, Philippe Mathieu-Daudé wrote:
> mips_itu.c only requires declarations from "hw/core/cpu.h"
> and "cpu.h". Avoid including the huge "exec/exec-all.h" header.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/misc/mips_itu.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c
> index 5a83ccc4e8..37aea0e737 100644
> --- a/hw/misc/mips_itu.c
> +++ b/hw/misc/mips_itu.c
> @@ -22,9 +22,10 @@
>   #include "qemu/log.h"
>   #include "qemu/module.h"
>   #include "qapi/error.h"
> -#include "exec/exec-all.h"
> +#include "hw/core/cpu.h"
>   #include "hw/misc/mips_itu.h"
>   #include "hw/qdev-properties.h"
> +#include "target/mips/cpu.h"
>   
>   #define ITC_TAG_ADDRSPACE_SZ (ITC_ADDRESSMAP_NUM * 8)
>   /* Initialize as 4kB area to fit all 32 cells with default 128B grain.

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 4/4] target: Restrict 'sysemu/reset.h' to system emulation

[Thomas Huth]

On 12/12/2023 12.36, Philippe Mathieu-Daudé wrote:
> vCPU "reset" is only possible with system emulation.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Warner Losh <imp@bsdimp.com>
> Reviewed-by: Song Gao <gaosong@loongson.cn>
> ---
>   target/i386/cpu.c      | 2 +-
>   target/loongarch/cpu.c | 2 ++
>   2 files changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 1/4] hw/ppc/spapr_hcall: Remove unused 'exec/exec-all.h' included header

[Richard Henderson]

On 12/12/23 03:36, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
>   hw/ppc/spapr_hcall.c | 1 -
>   1 file changed, 1 deletion(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH 4/4] target: Restrict 'sysemu/reset.h' to system emulation

[Zhao Liu]

On Tue, Dec 12, 2023 at 12:36:40PM +0100, Philippe Mathieu-Daudé wrote:
> Date: Tue, 12 Dec 2023 12:36:40 +0100
> From: Philippe Mathieu-Daudé <philmd@linaro.org>
> Subject: [PATCH 4/4] target: Restrict 'sysemu/reset.h' to system emulation
> X-Mailer: git-send-email 2.41.0
> 
> vCPU "reset" is only possible with system emulation.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Warner Losh <imp@bsdimp.com>
> Reviewed-by: Song Gao <gaosong@loongson.cn>
> ---

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>

>  target/i386/cpu.c      | 2 +-
>  target/loongarch/cpu.c | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index dfb96217ad..17b6962d43 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -24,7 +24,6 @@
>  #include "qemu/hw-version.h"
>  #include "cpu.h"
>  #include "tcg/helper-tcg.h"
> -#include "sysemu/reset.h"
>  #include "sysemu/hvf.h"
>  #include "hvf/hvf-i386.h"
>  #include "kvm/kvm_i386.h"
> @@ -37,6 +36,7 @@
>  #include "hw/qdev-properties.h"
>  #include "hw/i386/topology.h"
>  #ifndef CONFIG_USER_ONLY
> +#include "sysemu/reset.h"
>  #include "qapi/qapi-commands-machine-target.h"
>  #include "exec/address-spaces.h"
>  #include "hw/boards.h"
> diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
> index fc075952e6..b26187dfde 100644
> --- a/target/loongarch/cpu.c
> +++ b/target/loongarch/cpu.c
> @@ -17,7 +17,9 @@
>  #include "internals.h"
>  #include "fpu/softfloat-helpers.h"
>  #include "cpu-csr.h"
> +#ifndef CONFIG_USER_ONLY
>  #include "sysemu/reset.h"
> +#endif
>  #include "tcg/tcg.h"
>  #include "vec.h"
>  
> -- 
> 2.41.0
> 
> 

Re: [PATCH 3/4] hw/s390x/ipl: Remove unused 'exec/exec-all.h' included header

[Philippe Mathieu-Daudé]

On 13/12/23 09:18, Christian Borntraeger wrote:
> Am 12.12.23 um 16:28 schrieb Eric Farman:
>>> So why do you think exec-all.h is unused?
>> I think because that got moved out of exec-all.h a few months ago, via
>>
>> commit 3549118b498873c84b442bc280a5edafbb61e0a4
>> Author: Philippe Mathieu-Daudé <philmd@linaro.org>
>> Date:   Thu Sep 14 20:57:08 2023 +0200
>>
>>      exec: Move cpu_loop_foo() target agnostic functions to 'cpu-
>> common.h'
>>      While these functions are not TCG specific, they are not target
>>      specific. Move them to "exec/cpu-common.h" so their callers don't
>>      have to be tainted as target specific.

Indeed, thanks Eric for justifying this patch.

> Ah right, I was looking at an old QEMU version....

FYI I tried to clarify a bit these header patterns here:
https://lore.kernel.org/qemu-devel/20231226150441.97501-1-philmd@linaro.org/

Re: [PATCH 0/4] hw: Remove 'exec/exec-all.h' header when unused

[Philippe Mathieu-Daudé]

On 12/12/23 12:36, Philippe Mathieu-Daudé wrote:

> Philippe Mathieu-Daudé (4):
>    hw/ppc/spapr_hcall: Remove unused 'exec/exec-all.h' included header
>    hw/misc/mips_itu: Remove unnecessary 'exec/exec-all.h' header
>    hw/s390x/ipl: Remove unused 'exec/exec-all.h' included header
>    target: Restrict 'sysemu/reset.h' to system emulation

Thanks Thomas for also merging these :)