| Message ID | 20170913132417.24384-9-david@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 13.09.2017 15:24, David Hildenbrand wrote: > Implemented in sclp.c, so let's move it to the right include file. > Fix up one include. Do a forward declaration of struct CPUS390XState to > fix the two sclp consoles complaining. Is that sentence about the forward declaration still valid? I did not see that anymore here... Apart from that: Reviewed-by: Thomas Huth <thuth@redhat.com> > diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h > index a72d096081..847ff32f85 100644 > --- a/include/hw/s390x/sclp.h > +++ b/include/hw/s390x/sclp.h > @@ -16,6 +16,7 @@ > > #include "hw/sysbus.h" > #include "hw/qdev.h" > +#include "target/s390x/cpu-qom.h" > > #define SCLP_CMD_CODE_MASK 0xffff00ff > > @@ -242,5 +243,6 @@ sclpMemoryHotplugDev *init_sclp_memory_hotplug_dev(void); > sclpMemoryHotplugDev *get_sclp_memory_hotplug_dev(void); > void sclp_service_interrupt(uint32_t sccb); > void raise_irq_cpu_hotplug(void); > +int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code); > > #endif > diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h > index 4a0a59dfbc..5295bd3c66 100644 > --- a/target/s390x/cpu.h > +++ b/target/s390x/cpu.h > @@ -722,6 +722,5 @@ 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); > -int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code); > > #endif > diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c > index b142db71c6..8b07535b02 100644 > --- a/target/s390x/misc_helper.c > +++ b/target/s390x/misc_helper.c > @@ -35,6 +35,7 @@ > #include "sysemu/sysemu.h" > #include "hw/s390x/ebcdic.h" > #include "hw/s390x/s390-virtio-hcall.h" > +#include "hw/s390x/sclp.h" > #endif > > /* #define DEBUG_HELPER */ >
On 13.09.2017 16:29, Thomas Huth wrote: > On 13.09.2017 15:24, David Hildenbrand wrote: >> Implemented in sclp.c, so let's move it to the right include file. >> Fix up one include. Do a forward declaration of struct CPUS390XState to >> fix the two sclp consoles complaining. > > Is that sentence about the forward declaration still valid? I did not > see that anymore here... Nope, a leftover. Conny, can you fix this up if I don't have to resend? Thanks! > > Apart from that: > > Reviewed-by: Thomas Huth <thuth@redhat.com> > >
On Wed, 13 Sep 2017 16:29:23 +0200 Thomas Huth <thuth@redhat.com> wrote: > On 13.09.2017 15:24, David Hildenbrand wrote: > > Implemented in sclp.c, so let's move it to the right include file. > > Fix up one include. Do a forward declaration of struct CPUS390XState to > > fix the two sclp consoles complaining. > > Is that sentence about the forward declaration still valid? I did not > see that anymore here... Indeed. I can fix this up to: "Implemented in sclp.c, so let's move it to the right include file. Also adjust some includes." ? > > Apart from that: > > Reviewed-by: Thomas Huth <thuth@redhat.com>
On 13.09.2017 17:21, Cornelia Huck wrote: > On Wed, 13 Sep 2017 16:29:23 +0200 > Thomas Huth <thuth@redhat.com> wrote: > >> On 13.09.2017 15:24, David Hildenbrand wrote: >>> Implemented in sclp.c, so let's move it to the right include file. >>> Fix up one include. Do a forward declaration of struct CPUS390XState to >>> fix the two sclp consoles complaining. >> >> Is that sentence about the forward declaration still valid? I did not >> see that anymore here... > > Indeed. I can fix this up to: > > "Implemented in sclp.c, so let's move it to the right include file. > Also adjust some includes." > > ? You know how to use just the right words ;) Thanks!
diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index a72d096081..847ff32f85 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -16,6 +16,7 @@ #include "hw/sysbus.h" #include "hw/qdev.h" +#include "target/s390x/cpu-qom.h" #define SCLP_CMD_CODE_MASK 0xffff00ff @@ -242,5 +243,6 @@ sclpMemoryHotplugDev *init_sclp_memory_hotplug_dev(void); sclpMemoryHotplugDev *get_sclp_memory_hotplug_dev(void); void sclp_service_interrupt(uint32_t sccb); void raise_irq_cpu_hotplug(void); +int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code); #endif diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 4a0a59dfbc..5295bd3c66 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -722,6 +722,5 @@ 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); -int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code); #endif diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index b142db71c6..8b07535b02 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -35,6 +35,7 @@ #include "sysemu/sysemu.h" #include "hw/s390x/ebcdic.h" #include "hw/s390x/s390-virtio-hcall.h" +#include "hw/s390x/sclp.h" #endif /* #define DEBUG_HELPER */
Implemented in sclp.c, so let's move it to the right include file. Fix up one include. Do a forward declaration of struct CPUS390XState to fix the two sclp consoles complaining. Signed-off-by: David Hildenbrand <david@redhat.com> --- include/hw/s390x/sclp.h | 2 ++ target/s390x/cpu.h | 1 - target/s390x/misc_helper.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)