[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 07/21] s390x: move subsystem_reset() to s390-
From: |
Christian Borntraeger |
Subject: |
Re: [Qemu-devel] [PATCH v3 07/21] s390x: move subsystem_reset() to s390-virtio-ccw.h |
Date: |
Fri, 8 Sep 2017 09:50:02 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.0 |
On 09/07/2017 10:13 PM, David Hildenbrand wrote:
> Implemented in s390-virtio-ccw.c, so move it to the right header.
> We can also drop the extern. Fix up one include.
>
> Signed-off-by: David Hildenbrand <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
> ---
> include/hw/s390x/s390-virtio-ccw.h | 2 ++
> target/s390x/cpu.h | 1 -
> target/s390x/diag.c | 1 +
> 3 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/include/hw/s390x/s390-virtio-ccw.h
> b/include/hw/s390x/s390-virtio-ccw.h
> index 41a9d2862b..a9a90c2022 100644
> --- a/include/hw/s390x/s390-virtio-ccw.h
> +++ b/include/hw/s390x/s390-virtio-ccw.h
> @@ -56,4 +56,6 @@ bool gs_allowed(void);
> */
> bool css_migration_enabled(void);
>
> +void subsystem_reset(void);
> +
> #endif
> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
> index 2343f2f1f7..3aa2e46aac 100644
> --- a/target/s390x/cpu.h
> +++ b/target/s390x/cpu.h
> @@ -721,7 +721,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)
> {
>
- [Qemu-devel] [PATCH v3 00/21] s390x cleanups and CPU hotplug via device_add, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 01/21] exec, dump, i386, ppc, s390x: don't include exec/cpu-all.h explicitly, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 02/21] cpu: drop old comments describing members, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 04/21] s390x: rename s390-virtio.h to s390-virtio-hcall.h, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 03/21] s390x: get rid of s390-virtio.c, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 05/21] target/s390x: move typedef of S390CPU to its definition, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 06/21] s390x: move s390_virtio_hypercall() to s390-virtio-hcall.h, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 07/21] s390x: move subsystem_reset() to s390-virtio-ccw.h, David Hildenbrand, 2017/09/07
- [Qemu-devel] [PATCH v3 08/21] s390x: move sclp_service_call() to sclp.h, David Hildenbrand, 2017/09/07
- Re: [Qemu-devel] [PATCH v3 08/21] s390x: move sclp_service_call() to sclp.h, Thomas Huth, 2017/09/08
- Re: [Qemu-devel] [PATCH v3 08/21] s390x: move sclp_service_call() to sclp.h, David Hildenbrand, 2017/09/08
- Re: [Qemu-devel] [PATCH v3 08/21] s390x: move sclp_service_call() to sclp.h, Eduardo Habkost, 2017/09/09
- Re: [Qemu-devel] [PATCH v3 08/21] s390x: move sclp_service_call() to sclp.h, Thomas Huth, 2017/09/10
- Re: [Qemu-devel] [PATCH v3 08/21] s390x: move sclp_service_call() to sclp.h, Eduardo Habkost, 2017/09/11
- Re: [Qemu-devel] [PATCH v3 08/21] s390x: move sclp_service_call() to sclp.h, Paolo Bonzini, 2017/09/11
- Re: [Qemu-devel] [PATCH v3 08/21] s390x: move sclp_service_call() to sclp.h, David Hildenbrand, 2017/09/11