[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 07/19] s390x: move two function declarations
From: |
Thomas Huth |
Subject: |
Re: [Qemu-devel] [PATCH v2 07/19] s390x: move two function declarations to s390-virtio-ccw.h |
Date: |
Thu, 7 Sep 2017 08:04:17 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 |
On 04.09.2017 17:43, David Hildenbrand wrote:
> We can also drop the extern. Fix up includes.
>
> Signed-off-by: David Hildenbrand <address@hidden>
> ---
> include/hw/s390x/s390-virtio-ccw.h | 3 +++
> target/s390x/cpu.h | 2 --
> target/s390x/diag.c | 1 +
> target/s390x/interrupt.c | 3 +++
> 4 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/include/hw/s390x/s390-virtio-ccw.h
> b/include/hw/s390x/s390-virtio-ccw.h
> index 41a9d2862b..42f2ccdb43 100644
> --- a/include/hw/s390x/s390-virtio-ccw.h
> +++ b/include/hw/s390x/s390-virtio-ccw.h
> @@ -56,4 +56,7 @@ bool gs_allowed(void);
> */
> bool css_migration_enabled(void);
>
> +S390CPU *s390_cpu_addr2state(uint16_t cpu_addr);
> +void subsystem_reset(void);
> +
> #endif
> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
> index 2343f2f1f7..6c0abb9894 100644
> --- a/target/s390x/cpu.h
> +++ b/target/s390x/cpu.h
> @@ -720,8 +720,6 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr,
> uint8_t ar, void *hostbuf,
>
>
> /* outside of target/s390x/ */
> -S390CPU *s390_cpu_addr2state(uint16_t cpu_addr);
> -extern void subsystem_reset(void);
> int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code);
>
> #endif
> diff --git a/target/s390x/diag.c b/target/s390x/diag.c
> index e6b5e6de37..82a623948d 100644
> --- a/target/s390x/diag.c
> +++ b/target/s390x/diag.c
> @@ -20,6 +20,7 @@
> #include "hw/watchdog/wdt_diag288.h"
> #include "sysemu/cpus.h"
> #include "hw/s390x/ipl.h"
> +#include "hw/s390x/s390-virtio-ccw.h"
>
> static int modified_clear_reset(S390CPU *cpu)
> {
> diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c
> index 058e219fe5..9aa6b89301 100644
> --- a/target/s390x/interrupt.c
> +++ b/target/s390x/interrupt.c
> @@ -15,6 +15,9 @@
> #include "exec/exec-all.h"
> #include "sysemu/kvm.h"
> #include "hw/s390x/ioinst.h"
> +#if !defined(CONFIG_USER_ONLY)
> +#include "hw/s390x/s390-virtio-ccw.h"
> +#endif
>
> /* Ensure to exit the TB after this call! */
> void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen)
>
If I listen to my gut feeling, I still think we should rather move
s390_cpu_addr2state() to cpu.c instead. It does not sound as it's really
specific to the virtio-ccw machine... Just my 0.02 €
Thomas
- [Qemu-devel] [PATCH v2 02/19] cpu: drop old comments describing members, (continued)
- [Qemu-devel] [PATCH v2 02/19] cpu: drop old comments describing members, David Hildenbrand, 2017/09/04
- [Qemu-devel] [PATCH v2 04/19] s390x: rename s390-virtio.h to s390-virtio-hcall.h, David Hildenbrand, 2017/09/04
- [Qemu-devel] [PATCH v2 03/19] s390x: get rid of s390-virtio.c, David Hildenbrand, 2017/09/04
- [Qemu-devel] [PATCH v2 05/19] target/s390x: move typedef of S390CPU to its definition, David Hildenbrand, 2017/09/04
- [Qemu-devel] [PATCH v2 06/19] s390x: move s390_virtio_hypercall() to s390-virtio-hcall.h, David Hildenbrand, 2017/09/04
- [Qemu-devel] [PATCH v2 07/19] s390x: move two function declarations to s390-virtio-ccw.h, David Hildenbrand, 2017/09/04
- Re: [Qemu-devel] [PATCH v2 07/19] s390x: move two function declarations to s390-virtio-ccw.h,
Thomas Huth <=
- [Qemu-devel] [PATCH v2 08/19] s390x: move sclp_service_call() to interrupt.c, David Hildenbrand, 2017/09/04
[Qemu-devel] [PATCH v2 09/19] target/s390x: use trigger_pgm_exception() in s390_cpu_handle_mmu_fault(), David Hildenbrand, 2017/09/04