diff options
| author | Cédric Le Goater <clg@redhat.com> | 2024-05-02 15:15:31 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2024-05-10 06:23:56 +0200 |
| commit | b350f6c8ed4fd796454d0f26482f3e9d9285fda1 (patch) | |
| tree | e3e33cb63d78698ab84bdea01c2005369bc7ca2b /include | |
| parent | c990c1f35b80de53570f11433d71624aca185763 (diff) | |
| download | qemu-b350f6c8ed4fd796454d0f26482f3e9d9285fda1.zip qemu-b350f6c8ed4fd796454d0f26482f3e9d9285fda1.tar.gz qemu-b350f6c8ed4fd796454d0f26482f3e9d9285fda1.tar.bz2 | |
s390x: Introduce a SCLPDevice pointer under the machine
Initialize directly SCLPDevice from the machine init handler and
remove s390_sclp_init(). We will use the SCLPDevice pointer later to
create the consoles.
Signed-off-by: Cédric Le Goater <clg@redhat.com>
Message-ID: <20240502131533.377719-2-clg@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/s390x/s390-virtio-ccw.h | 3 | ||||
| -rw-r--r-- | include/hw/s390x/sclp.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h index c1d46e7..7605d06 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -13,6 +13,7 @@ #include "hw/boards.h" #include "qom/object.h" +#include "hw/s390x/sclp.h" #define TYPE_S390_CCW_MACHINE "s390-ccw-machine" @@ -28,6 +29,8 @@ struct S390CcwMachineState { bool dea_key_wrap; bool pv; uint8_t loadparm[8]; + + SCLPDevice *sclp; }; #define S390_PTF_REASON_NONE (0x00 << 8) diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index b405a38..d32f618 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -221,8 +221,6 @@ static inline int sccb_data_len(SCCB *sccb) return be16_to_cpu(sccb->h.length) - sizeof(sccb->h); } - -void s390_sclp_init(void); void sclp_service_interrupt(uint32_t sccb); void raise_irq_cpu_hotplug(void); int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint32_t code); |