[PATCH v2 0/7] exec/cpu: Cleanups around "exec/hwaddr.h" (reserved to system-mode)

[PATCH v2 0/7] exec/cpu: Cleanups around "exec/hwaddr.h" (reserved to system-mode)

[Philippe Mathieu-Daudé]

The 'hwaddr' type declared in "exec/hwaddr.h" is meant for
system-mode emulation only.
This series is a preparatory cleanup to allow later poisoning
it in user-mode code.

Missing review: patche 7
- target/s390x: Restrict system-mode declarations

Maybe PPC/S390X maintainers can take their patches and let
the rest to Paolo, or he can take all the series. They are
not dependents.

Since v1:
- Do not poison hwaddr type
- Addressed Cornelia & David review comments
- Added R-b/A-b

$ git backport-diff -u v1
Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
[down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/7:[----] [--] 'sysemu/accel: Restrict machine methods to system-mode'
002/7:[----] [--] 'sysemu/tcg: Only declare tcg_allowed when TCG is available'
003/7:[----] [--] 'sysemu/hvf: Only declare hvf_allowed when HVF is available'
004/7:[----] [--] 'target/ppc: Restrict PPCVirtualHypervisorClass to system-mode'
005/7:[----] [--] 'target/s390x: Only compile decode_basedisp() on system-mode'
006/7:[0002] [FC] 'target/s390x/helper: Clean ifdef'ry'
007/7:[0005] [FC] 'target/s390x: Restrict system-mode declarations'

Supersedes: <20200509130910.26335-1-f4bug@amsat.org>

Philippe Mathieu-Daudé (7):
  sysemu/accel: Restrict machine methods to system-mode
  sysemu/tcg: Only declare tcg_allowed when TCG is available
  sysemu/hvf: Only declare hvf_allowed when HVF is available
  target/ppc: Restrict PPCVirtualHypervisorClass to system-mode
  target/s390x: Only compile decode_basedisp() on system-mode
  target/s390x/helper: Clean ifdef'ry
  target/s390x: Restrict system-mode declarations

 include/sysemu/accel.h          |  2 ++
 include/sysemu/hvf.h            |  6 +++---
 include/sysemu/tcg.h            |  2 +-
 target/ppc/cpu.h                |  4 ++--
 target/ppc/kvm_ppc.h            | 22 +++++++++++-----------
 target/s390x/internal.h         | 16 +++++++++++-----
 target/ppc/translate_init.inc.c |  4 ++++
 target/s390x/helper.c           |  5 -----
 8 files changed, 34 insertions(+), 27 deletions(-)

-- 
2.21.3

[PATCH v2 1/7] sysemu/accel: Restrict machine methods to system-mode

[Philippe Mathieu-Daudé]

Restrict init_machine(), setup_post() and has_memory()
to system-mode.

Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 include/sysemu/accel.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h
index 47e5788530..e08b8ab8fa 100644
--- a/include/sysemu/accel.h
+++ b/include/sysemu/accel.h
@@ -37,10 +37,12 @@ typedef struct AccelClass {
     /*< public >*/
 
     const char *name;
+#ifndef CONFIG_USER_ONLY
     int (*init_machine)(MachineState *ms);
     void (*setup_post)(MachineState *ms, AccelState *accel);
     bool (*has_memory)(MachineState *ms, AddressSpace *as,
                        hwaddr start_addr, hwaddr size);
+#endif
     bool *allowed;
     /*
      * Array of global properties that would be applied when specific
-- 
2.21.3

[PATCH v2 2/7] sysemu/tcg: Only declare tcg_allowed when TCG is available

[Philippe Mathieu-Daudé]

When TCG is not available, the tcg_allowed variable does not exist.

Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 include/sysemu/tcg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/sysemu/tcg.h b/include/sysemu/tcg.h
index 7d116d2e80..d9d3ca8559 100644
--- a/include/sysemu/tcg.h
+++ b/include/sysemu/tcg.h
@@ -8,9 +8,9 @@
 #ifndef SYSEMU_TCG_H
 #define SYSEMU_TCG_H
 
-extern bool tcg_allowed;
 void tcg_exec_init(unsigned long tb_size);
 #ifdef CONFIG_TCG
+extern bool tcg_allowed;
 #define tcg_enabled() (tcg_allowed)
 #else
 #define tcg_enabled() 0
-- 
2.21.3

[PATCH v2 3/7] sysemu/hvf: Only declare hvf_allowed when HVF is available

[Philippe Mathieu-Daudé]

When HVF is not available, the hvf_allowed variable does not exist.

Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
v2: Fixed typo s/tcg_allowed/hvf_allowed/ (Edgar)
---
 include/sysemu/hvf.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h
index d211e808e9..fe95743124 100644
--- a/include/sysemu/hvf.h
+++ b/include/sysemu/hvf.h
@@ -18,7 +18,6 @@
 #include "exec/memory.h"
 #include "sysemu/accel.h"
 
-extern bool hvf_allowed;
 #ifdef CONFIG_HVF
 #include <Hypervisor/hv.h>
 #include <Hypervisor/hv_vmx.h>
@@ -26,11 +25,12 @@ extern bool hvf_allowed;
 #include "target/i386/cpu.h"
 uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,
                                  int reg);
+extern bool hvf_allowed;
 #define hvf_enabled() (hvf_allowed)
-#else
+#else /* !CONFIG_HVF */
 #define hvf_enabled() 0
 #define hvf_get_supported_cpuid(func, idx, reg) 0
-#endif
+#endif /* !CONFIG_HVF */
 
 /* hvf_slot flags */
 #define HVF_SLOT_LOG (1 << 0)
-- 
2.21.3

[PATCH v2 4/7] target/ppc: Restrict PPCVirtualHypervisorClass to system-mode

[Philippe Mathieu-Daudé]

The code related to PPC Virtual Hypervisor is pointless in user-mode.

Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 target/ppc/cpu.h                |  4 ++--
 target/ppc/kvm_ppc.h            | 22 +++++++++++-----------
 target/ppc/translate_init.inc.c |  4 ++++
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 7db7882f52..13d6976534 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1176,6 +1176,7 @@ PowerPCCPUClass *ppc_cpu_class_by_pvr(uint32_t pvr);
 PowerPCCPUClass *ppc_cpu_class_by_pvr_mask(uint32_t pvr);
 PowerPCCPUClass *ppc_cpu_get_family_class(PowerPCCPUClass *pcc);
 
+#ifndef CONFIG_USER_ONLY
 struct PPCVirtualHypervisorClass {
     InterfaceClass parent;
     void (*hypercall)(PPCVirtualHypervisor *vhyp, PowerPCCPU *cpu);
@@ -1189,10 +1190,8 @@ struct PPCVirtualHypervisorClass {
     void (*hpte_set_r)(PPCVirtualHypervisor *vhyp, hwaddr ptex, uint64_t pte1);
     void (*get_pate)(PPCVirtualHypervisor *vhyp, ppc_v3_pate_t *entry);
     target_ulong (*encode_hpt_for_kvm_pr)(PPCVirtualHypervisor *vhyp);
-#ifndef CONFIG_USER_ONLY
     void (*cpu_exec_enter)(PPCVirtualHypervisor *vhyp, PowerPCCPU *cpu);
     void (*cpu_exec_exit)(PPCVirtualHypervisor *vhyp, PowerPCCPU *cpu);
-#endif
 };
 
 #define TYPE_PPC_VIRTUAL_HYPERVISOR "ppc-virtual-hypervisor"
@@ -1204,6 +1203,7 @@ struct PPCVirtualHypervisorClass {
 #define PPC_VIRTUAL_HYPERVISOR_GET_CLASS(obj) \
     OBJECT_GET_CLASS(PPCVirtualHypervisorClass, (obj), \
                      TYPE_PPC_VIRTUAL_HYPERVISOR)
+#endif /* CONFIG_USER_ONLY */
 
 void ppc_cpu_do_interrupt(CPUState *cpu);
 bool ppc_cpu_exec_interrupt(CPUState *cpu, int int_req);
diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
index fcaf745516..701c0c262b 100644
--- a/target/ppc/kvm_ppc.h
+++ b/target/ppc/kvm_ppc.h
@@ -280,6 +280,17 @@ static inline bool kvmppc_has_cap_spapr_vfio(void)
     return false;
 }
 
+static inline void kvmppc_read_hptes(ppc_hash_pte64_t *hptes,
+                                     hwaddr ptex, int n)
+{
+    abort();
+}
+
+static inline void kvmppc_write_hpte(hwaddr ptex, uint64_t pte0, uint64_t pte1)
+{
+    abort();
+}
+
 #endif /* !CONFIG_USER_ONLY */
 
 static inline bool kvmppc_has_cap_epr(void)
@@ -310,17 +321,6 @@ static inline int kvmppc_load_htab_chunk(QEMUFile *f, int fd, uint32_t index,
     abort();
 }
 
-static inline void kvmppc_read_hptes(ppc_hash_pte64_t *hptes,
-                                     hwaddr ptex, int n)
-{
-    abort();
-}
-
-static inline void kvmppc_write_hpte(hwaddr ptex, uint64_t pte0, uint64_t pte1)
-{
-    abort();
-}
-
 static inline bool kvmppc_has_cap_fixup_hcalls(void)
 {
     abort();
diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c
index d8adc1bd49..09f8b10e27 100644
--- a/target/ppc/translate_init.inc.c
+++ b/target/ppc/translate_init.inc.c
@@ -10941,16 +10941,20 @@ static const TypeInfo ppc_cpu_type_info = {
     .class_init = ppc_cpu_class_init,
 };
 
+#ifndef CONFIG_USER_ONLY
 static const TypeInfo ppc_vhyp_type_info = {
     .name = TYPE_PPC_VIRTUAL_HYPERVISOR,
     .parent = TYPE_INTERFACE,
     .class_size = sizeof(PPCVirtualHypervisorClass),
 };
+#endif
 
 static void ppc_cpu_register_types(void)
 {
     type_register_static(&ppc_cpu_type_info);
+#ifndef CONFIG_USER_ONLY
     type_register_static(&ppc_vhyp_type_info);
+#endif
 }
 
 type_init(ppc_cpu_register_types)
-- 
2.21.3

[PATCH v2 5/7] target/s390x: Only compile decode_basedisp() on system-mode

[Philippe Mathieu-Daudé]

The decode_basedisp*() methods are only used in ioinst.c,
which is only build in system-mode emulation.

I/O instructions are privileged, and other S instructions
are decoded elsewhere.

Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 target/s390x/internal.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/target/s390x/internal.h b/target/s390x/internal.h
index 8c95c734db..c1678dc6bc 100644
--- a/target/s390x/internal.h
+++ b/target/s390x/internal.h
@@ -204,6 +204,8 @@ enum cc_op {
     CC_OP_MAX
 };
 
+#ifndef CONFIG_USER_ONLY
+
 static inline hwaddr decode_basedisp_s(CPUS390XState *env, uint32_t ipb,
                                        uint8_t *ar)
 {
@@ -225,6 +227,8 @@ static inline hwaddr decode_basedisp_s(CPUS390XState *env, uint32_t ipb,
 /* Base/displacement are at the same locations. */
 #define decode_basedisp_rs decode_basedisp_s
 
+#endif /* CONFIG_USER_ONLY */
+
 /* arch_dump.c */
 int s390_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
                               int cpuid, void *opaque);
-- 
2.21.3

[PATCH v2 6/7] target/s390x/helper: Clean ifdef'ry

[Philippe Mathieu-Daudé]

All this code is guarded checking CONFIG_USER_ONLY definition.
Drop the duplicated checks.

Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 target/s390x/helper.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/target/s390x/helper.c b/target/s390x/helper.c
index 09f60406aa..9257d388ba 100644
--- a/target/s390x/helper.c
+++ b/target/s390x/helper.c
@@ -42,9 +42,6 @@ void s390x_cpu_timer(void *opaque)
 {
     cpu_inject_cpu_timer((S390CPU *) opaque);
 }
-#endif
-
-#ifndef CONFIG_USER_ONLY
 
 hwaddr s390_cpu_get_phys_page_debug(CPUState *cs, vaddr vaddr)
 {
@@ -98,14 +95,12 @@ void s390_handle_wait(S390CPU *cpu)
     CPUState *cs = CPU(cpu);
 
     if (s390_cpu_halt(cpu) == 0) {
-#ifndef CONFIG_USER_ONLY
         if (is_special_wait_psw(cpu->env.psw.addr)) {
             qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
         } else {
             cpu->env.crash_reason = S390_CRASH_REASON_DISABLED_WAIT;
             qemu_system_guest_panicked(cpu_get_crash_info(cs));
         }
-#endif
     }
 }
 
-- 
2.21.3

[PATCH v2 7/7] target/s390x: Restrict system-mode declarations

[Philippe Mathieu-Daudé]

As these declarations are restricted to !CONFIG_USER_ONLY in
helper.c, only declare them when system-mode emulation is used.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
v2: Keep load_psw() is /* cc_helper.c */ section (cohuck)
---
 target/s390x/internal.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/target/s390x/internal.h b/target/s390x/internal.h
index c1678dc6bc..b1e0ebf67f 100644
--- a/target/s390x/internal.h
+++ b/target/s390x/internal.h
@@ -236,9 +236,11 @@ int s390_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
 
 /* cc_helper.c */
 const char *cc_name(enum cc_op cc_op);
-void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr);
 uint32_t calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t src, uint64_t dst,
                  uint64_t vr);
+#ifndef CONFIG_USER_ONLY
+void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr);
+#endif /* CONFIG_USER_ONLY */
 
 
 /* cpu.c */
@@ -303,18 +305,18 @@ void s390_cpu_gdb_init(CPUState *cs);
 
 /* helper.c */
 void s390_cpu_dump_state(CPUState *cpu, FILE *f, int flags);
-hwaddr s390_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
-hwaddr s390_cpu_get_phys_addr_debug(CPUState *cpu, vaddr addr);
+void do_restart_interrupt(CPUS390XState *env);
+#ifndef CONFIG_USER_ONLY
 uint64_t get_psw_mask(CPUS390XState *env);
 void s390_cpu_recompute_watchpoints(CPUState *cs);
 void s390x_tod_timer(void *opaque);
 void s390x_cpu_timer(void *opaque);
-void do_restart_interrupt(CPUS390XState *env);
 void s390_handle_wait(S390CPU *cpu);
+hwaddr s390_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
+hwaddr s390_cpu_get_phys_addr_debug(CPUState *cpu, vaddr addr);
 #define S390_STORE_STATUS_DEF_ADDR offsetof(LowCore, floating_pt_save_area)
 int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch);
 int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len);
-#ifndef CONFIG_USER_ONLY
 LowCore *cpu_map_lowcore(CPUS390XState *env);
 void cpu_unmap_lowcore(LowCore *lowcore);
 #endif /* CONFIG_USER_ONLY */
-- 
2.21.3

Re: [PATCH v2 3/7] sysemu/hvf: Only declare hvf_allowed when HVF is available

[Roman Bolshakov]

On Tue, May 26, 2020 at 07:24:23PM +0200, Philippe Mathieu-Daudé wrote:
> When HVF is not available, the hvf_allowed variable does not exist.
> 
> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
> Reviewed-by: Cornelia Huck <cohuck@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> v2: Fixed typo s/tcg_allowed/hvf_allowed/ (Edgar)
> ---
>  include/sysemu/hvf.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h
> index d211e808e9..fe95743124 100644
> --- a/include/sysemu/hvf.h
> +++ b/include/sysemu/hvf.h
> @@ -18,7 +18,6 @@
>  #include "exec/memory.h"
>  #include "sysemu/accel.h"
>  
> -extern bool hvf_allowed;
>  #ifdef CONFIG_HVF
>  #include <Hypervisor/hv.h>
>  #include <Hypervisor/hv_vmx.h>
> @@ -26,11 +25,12 @@ extern bool hvf_allowed;
>  #include "target/i386/cpu.h"
>  uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,
>                                   int reg);
> +extern bool hvf_allowed;
>  #define hvf_enabled() (hvf_allowed)
> -#else
> +#else /* !CONFIG_HVF */
>  #define hvf_enabled() 0
>  #define hvf_get_supported_cpuid(func, idx, reg) 0
> -#endif
> +#endif /* !CONFIG_HVF */
>  
>  /* hvf_slot flags */
>  #define HVF_SLOT_LOG (1 << 0)
> -- 
> 2.21.3
> 

Reviewed-by: Roman Bolshakov <r.bolshakov@yadro.com>

Thanks,
Roman

Re: [PATCH v2 1/7] sysemu/accel: Restrict machine methods to system-mode

[Roman Bolshakov]

On Tue, May 26, 2020 at 07:24:21PM +0200, Philippe Mathieu-Daudé wrote:
> Restrict init_machine(), setup_post() and has_memory()
> to system-mode.
> 
> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
> Reviewed-by: Cornelia Huck <cohuck@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  include/sysemu/accel.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h
> index 47e5788530..e08b8ab8fa 100644
> --- a/include/sysemu/accel.h
> +++ b/include/sysemu/accel.h
> @@ -37,10 +37,12 @@ typedef struct AccelClass {
>      /*< public >*/
>  
>      const char *name;
> +#ifndef CONFIG_USER_ONLY
>      int (*init_machine)(MachineState *ms);
>      void (*setup_post)(MachineState *ms, AccelState *accel);
>      bool (*has_memory)(MachineState *ms, AddressSpace *as,
>                         hwaddr start_addr, hwaddr size);
> +#endif
>      bool *allowed;
>      /*
>       * Array of global properties that would be applied when specific
> -- 
> 2.21.3
> 

Reviewed-by: Roman Bolshakov <r.bolshakov@yadro.com>

Thanks,
Roman

Re: [PATCH v2 7/7] target/s390x: Restrict system-mode declarations

[Cornelia Huck]

On Tue, 26 May 2020 19:24:27 +0200
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:

> As these declarations are restricted to !CONFIG_USER_ONLY in
> helper.c, only declare them when system-mode emulation is used.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> v2: Keep load_psw() is /* cc_helper.c */ section (cohuck)
> ---
>  target/s390x/internal.h | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

Re: [PATCH v2 0/7] exec/cpu: Cleanups around "exec/hwaddr.h" (reserved to system-mode)

[Cornelia Huck]

On Tue, 26 May 2020 19:24:20 +0200
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:

> The 'hwaddr' type declared in "exec/hwaddr.h" is meant for
> system-mode emulation only.
> This series is a preparatory cleanup to allow later poisoning
> it in user-mode code.
> 
> Missing review: patche 7
> - target/s390x: Restrict system-mode declarations
> 
> Maybe PPC/S390X maintainers can take their patches and let
> the rest to Paolo, or he can take all the series. They are
> not dependents.

I can take the s390x patches (want to send a pull req soon anyway), but
I'm also fine with them going via Paolo, if that is more convenient.

Paolo: Just let me know if you plan to queue them, otherwise I'll go
ahead.

> 
> Since v1:
> - Do not poison hwaddr type
> - Addressed Cornelia & David review comments
> - Added R-b/A-b
> 
> $ git backport-diff -u v1
> Key:
> [----] : patches are identical
> [####] : number of functional differences between upstream/downstream patch
> [down] : patch is downstream-only
> The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
> 
> 001/7:[----] [--] 'sysemu/accel: Restrict machine methods to system-mode'
> 002/7:[----] [--] 'sysemu/tcg: Only declare tcg_allowed when TCG is available'
> 003/7:[----] [--] 'sysemu/hvf: Only declare hvf_allowed when HVF is available'
> 004/7:[----] [--] 'target/ppc: Restrict PPCVirtualHypervisorClass to system-mode'
> 005/7:[----] [--] 'target/s390x: Only compile decode_basedisp() on system-mode'
> 006/7:[0002] [FC] 'target/s390x/helper: Clean ifdef'ry'
> 007/7:[0005] [FC] 'target/s390x: Restrict system-mode declarations'
> 
> Supersedes: <20200509130910.26335-1-f4bug@amsat.org>
> 
> Philippe Mathieu-Daudé (7):
>   sysemu/accel: Restrict machine methods to system-mode
>   sysemu/tcg: Only declare tcg_allowed when TCG is available
>   sysemu/hvf: Only declare hvf_allowed when HVF is available
>   target/ppc: Restrict PPCVirtualHypervisorClass to system-mode
>   target/s390x: Only compile decode_basedisp() on system-mode
>   target/s390x/helper: Clean ifdef'ry
>   target/s390x: Restrict system-mode declarations
> 
>  include/sysemu/accel.h          |  2 ++
>  include/sysemu/hvf.h            |  6 +++---
>  include/sysemu/tcg.h            |  2 +-
>  target/ppc/cpu.h                |  4 ++--
>  target/ppc/kvm_ppc.h            | 22 +++++++++++-----------
>  target/s390x/internal.h         | 16 +++++++++++-----
>  target/ppc/translate_init.inc.c |  4 ++++
>  target/s390x/helper.c           |  5 -----
>  8 files changed, 34 insertions(+), 27 deletions(-)
> 

Re: [PATCH v2 0/7] exec/cpu: Cleanups around "exec/hwaddr.h" (reserved to system-mode)

[Cornelia Huck]

On Tue, 26 May 2020 19:24:20 +0200
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:

> The 'hwaddr' type declared in "exec/hwaddr.h" is meant for
> system-mode emulation only.
> This series is a preparatory cleanup to allow later poisoning
> it in user-mode code.
> 
> Missing review: patche 7
> - target/s390x: Restrict system-mode declarations
> 
> Maybe PPC/S390X maintainers can take their patches and let
> the rest to Paolo, or he can take all the series. They are
> not dependents.

(...)

>   target/s390x: Only compile decode_basedisp() on system-mode
>   target/s390x/helper: Clean ifdef'ry
>   target/s390x: Restrict system-mode declarations

(...)

Ok, I went ahead and queued patches 5-7 to s390-next.

Re: [PATCH v2 0/7] exec/cpu: Cleanups around "exec/hwaddr.h" (reserved to system-mode)

[Paolo Bonzini]

On 26/05/20 19:24, Philippe Mathieu-Daudé wrote:
> The 'hwaddr' type declared in "exec/hwaddr.h" is meant for
> system-mode emulation only.
> This series is a preparatory cleanup to allow later poisoning
> it in user-mode code.
> 
> Missing review: patche 7
> - target/s390x: Restrict system-mode declarations
> 
> Maybe PPC/S390X maintainers can take their patches and let
> the rest to Paolo, or he can take all the series. They are
> not dependents.
> 
> Since v1:
> - Do not poison hwaddr type
> - Addressed Cornelia & David review comments
> - Added R-b/A-b
> 
> $ git backport-diff -u v1
> Key:
> [----] : patches are identical
> [####] : number of functional differences between upstream/downstream patch
> [down] : patch is downstream-only
> The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
> 
> 001/7:[----] [--] 'sysemu/accel: Restrict machine methods to system-mode'
> 002/7:[----] [--] 'sysemu/tcg: Only declare tcg_allowed when TCG is available'
> 003/7:[----] [--] 'sysemu/hvf: Only declare hvf_allowed when HVF is available'
> 004/7:[----] [--] 'target/ppc: Restrict PPCVirtualHypervisorClass to system-mode'
> 005/7:[----] [--] 'target/s390x: Only compile decode_basedisp() on system-mode'
> 006/7:[0002] [FC] 'target/s390x/helper: Clean ifdef'ry'
> 007/7:[0005] [FC] 'target/s390x: Restrict system-mode declarations'
> 
> Supersedes: <20200509130910.26335-1-f4bug@amsat.org>
> 
> Philippe Mathieu-Daudé (7):
>   sysemu/accel: Restrict machine methods to system-mode
>   sysemu/tcg: Only declare tcg_allowed when TCG is available
>   sysemu/hvf: Only declare hvf_allowed when HVF is available
>   target/ppc: Restrict PPCVirtualHypervisorClass to system-mode
>   target/s390x: Only compile decode_basedisp() on system-mode
>   target/s390x/helper: Clean ifdef'ry
>   target/s390x: Restrict system-mode declarations
> 
>  include/sysemu/accel.h          |  2 ++
>  include/sysemu/hvf.h            |  6 +++---
>  include/sysemu/tcg.h            |  2 +-
>  target/ppc/cpu.h                |  4 ++--
>  target/ppc/kvm_ppc.h            | 22 +++++++++++-----------
>  target/s390x/internal.h         | 16 +++++++++++-----
>  target/ppc/translate_init.inc.c |  4 ++++
>  target/s390x/helper.c           |  5 -----
>  8 files changed, 34 insertions(+), 27 deletions(-)
> 

Queued all, thanks.

Paolo

Re: [PATCH v2 0/7] exec/cpu: Cleanups around "exec/hwaddr.h" (reserved to system-mode)

[Cornelia Huck]

On Thu, 4 Jun 2020 20:11:38 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:

> On 26/05/20 19:24, Philippe Mathieu-Daudé wrote:
> > The 'hwaddr' type declared in "exec/hwaddr.h" is meant for
> > system-mode emulation only.
> > This series is a preparatory cleanup to allow later poisoning
> > it in user-mode code.
> > 
> > Missing review: patche 7
> > - target/s390x: Restrict system-mode declarations
> > 
> > Maybe PPC/S390X maintainers can take their patches and let
> > the rest to Paolo, or he can take all the series. They are
> > not dependents.
> > 
> > Since v1:
> > - Do not poison hwaddr type
> > - Addressed Cornelia & David review comments
> > - Added R-b/A-b
> > 
> > $ git backport-diff -u v1
> > Key:
> > [----] : patches are identical
> > [####] : number of functional differences between upstream/downstream patch
> > [down] : patch is downstream-only
> > The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
> > 
> > 001/7:[----] [--] 'sysemu/accel: Restrict machine methods to system-mode'
> > 002/7:[----] [--] 'sysemu/tcg: Only declare tcg_allowed when TCG is available'
> > 003/7:[----] [--] 'sysemu/hvf: Only declare hvf_allowed when HVF is available'
> > 004/7:[----] [--] 'target/ppc: Restrict PPCVirtualHypervisorClass to system-mode'
> > 005/7:[----] [--] 'target/s390x: Only compile decode_basedisp() on system-mode'
> > 006/7:[0002] [FC] 'target/s390x/helper: Clean ifdef'ry'
> > 007/7:[0005] [FC] 'target/s390x: Restrict system-mode declarations'
> > 
> > Supersedes: <20200509130910.26335-1-f4bug@amsat.org>
> > 
> > Philippe Mathieu-Daudé (7):
> >   sysemu/accel: Restrict machine methods to system-mode
> >   sysemu/tcg: Only declare tcg_allowed when TCG is available
> >   sysemu/hvf: Only declare hvf_allowed when HVF is available
> >   target/ppc: Restrict PPCVirtualHypervisorClass to system-mode
> >   target/s390x: Only compile decode_basedisp() on system-mode
> >   target/s390x/helper: Clean ifdef'ry
> >   target/s390x: Restrict system-mode declarations
> > 
> >  include/sysemu/accel.h          |  2 ++
> >  include/sysemu/hvf.h            |  6 +++---
> >  include/sysemu/tcg.h            |  2 +-
> >  target/ppc/cpu.h                |  4 ++--
> >  target/ppc/kvm_ppc.h            | 22 +++++++++++-----------
> >  target/s390x/internal.h         | 16 +++++++++++-----
> >  target/ppc/translate_init.inc.c |  4 ++++
> >  target/s390x/helper.c           |  5 -----
> >  8 files changed, 34 insertions(+), 27 deletions(-)
> >   
> 
> Queued all, thanks.

So, I guess I should unqueue patch 5-7 from s390-next again?

> 
> Paolo
> 

Re: [PATCH v2 0/7] exec/cpu: Cleanups around "exec/hwaddr.h" (reserved to system-mode)

[Paolo Bonzini]

On 05/06/20 16:18, Cornelia Huck wrote:
> On Thu, 4 Jun 2020 20:11:38 +0200
> Paolo Bonzini <pbonzini@redhat.com> wrote:
> 
>> On 26/05/20 19:24, Philippe Mathieu-Daudé wrote:
>>> The 'hwaddr' type declared in "exec/hwaddr.h" is meant for
>>> system-mode emulation only.
>>> This series is a preparatory cleanup to allow later poisoning
>>> it in user-mode code.
>>>
>>> Missing review: patche 7
>>> - target/s390x: Restrict system-mode declarations
>>>
>>> Maybe PPC/S390X maintainers can take their patches and let
>>> the rest to Paolo, or he can take all the series. They are
>>> not dependents.
>>>
>>> Since v1:
>>> - Do not poison hwaddr type
>>> - Addressed Cornelia & David review comments
>>> - Added R-b/A-b
>>>
>>> $ git backport-diff -u v1
>>> Key:
>>> [----] : patches are identical
>>> [####] : number of functional differences between upstream/downstream patch
>>> [down] : patch is downstream-only
>>> The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
>>>
>>> 001/7:[----] [--] 'sysemu/accel: Restrict machine methods to system-mode'
>>> 002/7:[----] [--] 'sysemu/tcg: Only declare tcg_allowed when TCG is available'
>>> 003/7:[----] [--] 'sysemu/hvf: Only declare hvf_allowed when HVF is available'
>>> 004/7:[----] [--] 'target/ppc: Restrict PPCVirtualHypervisorClass to system-mode'
>>> 005/7:[----] [--] 'target/s390x: Only compile decode_basedisp() on system-mode'
>>> 006/7:[0002] [FC] 'target/s390x/helper: Clean ifdef'ry'
>>> 007/7:[0005] [FC] 'target/s390x: Restrict system-mode declarations'
>>>
>>> Supersedes: <20200509130910.26335-1-f4bug@amsat.org>
>>>
>>> Philippe Mathieu-Daudé (7):
>>>   sysemu/accel: Restrict machine methods to system-mode
>>>   sysemu/tcg: Only declare tcg_allowed when TCG is available
>>>   sysemu/hvf: Only declare hvf_allowed when HVF is available
>>>   target/ppc: Restrict PPCVirtualHypervisorClass to system-mode
>>>   target/s390x: Only compile decode_basedisp() on system-mode
>>>   target/s390x/helper: Clean ifdef'ry
>>>   target/s390x: Restrict system-mode declarations
>>>
>>>  include/sysemu/accel.h          |  2 ++
>>>  include/sysemu/hvf.h            |  6 +++---
>>>  include/sysemu/tcg.h            |  2 +-
>>>  target/ppc/cpu.h                |  4 ++--
>>>  target/ppc/kvm_ppc.h            | 22 +++++++++++-----------
>>>  target/s390x/internal.h         | 16 +++++++++++-----
>>>  target/ppc/translate_init.inc.c |  4 ++++
>>>  target/s390x/helper.c           |  5 -----
>>>  8 files changed, 34 insertions(+), 27 deletions(-)
>>>   
>>
>> Queued all, thanks.
> 
> So, I guess I should unqueue patch 5-7 from s390-next again?

I can unqueue them too, no problem.

Paolo

Re: [PATCH v2 0/7] exec/cpu: Cleanups around "exec/hwaddr.h" (reserved to system-mode)

[Cornelia Huck]

On Fri, 5 Jun 2020 17:00:32 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:

> On 05/06/20 16:18, Cornelia Huck wrote:
> > On Thu, 4 Jun 2020 20:11:38 +0200
> > Paolo Bonzini <pbonzini@redhat.com> wrote:
> >   
> >> On 26/05/20 19:24, Philippe Mathieu-Daudé wrote:  
> >>> The 'hwaddr' type declared in "exec/hwaddr.h" is meant for
> >>> system-mode emulation only.
> >>> This series is a preparatory cleanup to allow later poisoning
> >>> it in user-mode code.
> >>>
> >>> Missing review: patche 7
> >>> - target/s390x: Restrict system-mode declarations
> >>>
> >>> Maybe PPC/S390X maintainers can take their patches and let
> >>> the rest to Paolo, or he can take all the series. They are
> >>> not dependents.
> >>>
> >>> Since v1:
> >>> - Do not poison hwaddr type
> >>> - Addressed Cornelia & David review comments
> >>> - Added R-b/A-b
> >>>
> >>> $ git backport-diff -u v1
> >>> Key:
> >>> [----] : patches are identical
> >>> [####] : number of functional differences between upstream/downstream patch
> >>> [down] : patch is downstream-only
> >>> The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
> >>>
> >>> 001/7:[----] [--] 'sysemu/accel: Restrict machine methods to system-mode'
> >>> 002/7:[----] [--] 'sysemu/tcg: Only declare tcg_allowed when TCG is available'
> >>> 003/7:[----] [--] 'sysemu/hvf: Only declare hvf_allowed when HVF is available'
> >>> 004/7:[----] [--] 'target/ppc: Restrict PPCVirtualHypervisorClass to system-mode'
> >>> 005/7:[----] [--] 'target/s390x: Only compile decode_basedisp() on system-mode'
> >>> 006/7:[0002] [FC] 'target/s390x/helper: Clean ifdef'ry'
> >>> 007/7:[0005] [FC] 'target/s390x: Restrict system-mode declarations'
> >>>
> >>> Supersedes: <20200509130910.26335-1-f4bug@amsat.org>
> >>>
> >>> Philippe Mathieu-Daudé (7):
> >>>   sysemu/accel: Restrict machine methods to system-mode
> >>>   sysemu/tcg: Only declare tcg_allowed when TCG is available
> >>>   sysemu/hvf: Only declare hvf_allowed when HVF is available
> >>>   target/ppc: Restrict PPCVirtualHypervisorClass to system-mode
> >>>   target/s390x: Only compile decode_basedisp() on system-mode
> >>>   target/s390x/helper: Clean ifdef'ry
> >>>   target/s390x: Restrict system-mode declarations
> >>>
> >>>  include/sysemu/accel.h          |  2 ++
> >>>  include/sysemu/hvf.h            |  6 +++---
> >>>  include/sysemu/tcg.h            |  2 +-
> >>>  target/ppc/cpu.h                |  4 ++--
> >>>  target/ppc/kvm_ppc.h            | 22 +++++++++++-----------
> >>>  target/s390x/internal.h         | 16 +++++++++++-----
> >>>  target/ppc/translate_init.inc.c |  4 ++++
> >>>  target/s390x/helper.c           |  5 -----
> >>>  8 files changed, 34 insertions(+), 27 deletions(-)
> >>>     
> >>
> >> Queued all, thanks.  
> > 
> > So, I guess I should unqueue patch 5-7 from s390-next again?  
> 
> I can unqueue them too, no problem.

Would probably be easiest, then I can send a pull req in a few minutes.

Re: [PATCH v2 0/7] exec/cpu: Cleanups around "exec/hwaddr.h" (reserved to system-mode)

[Paolo Bonzini]

On 05/06/20 17:13, Cornelia Huck wrote:
>>> So, I guess I should unqueue patch 5-7 from s390-next again?  
>> I can unqueue them too, no problem.
> Would probably be easiest, then I can send a pull req in a few minutes.
> 

Go ahead!

Paolo