| Message ID | 20170907201335.13956-8-david@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x cleanups and CPU hotplug via device_add | expand |
On 07.09.2017 22:13, 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 <david@redhat.com> > --- > 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(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
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 <david@redhat.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > 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) > { >
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) {
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 <david@redhat.com> --- 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(-)