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>
static void ccw_init(MachineState *machine)
{
MachineClass *mc = MACHINE_GET_CLASS(machine);
+ S390CcwMachineState *ms = S390_CCW_MACHINE(machine);
int ret;
VirtualCssBus *css_bus;
DeviceState *dev;
- s390_sclp_init();
+ ms->sclp = SCLP(object_new(TYPE_SCLP));
+ object_property_add_child(OBJECT(machine), TYPE_SCLP, OBJECT(ms->sclp));
+ qdev_realize_and_unref(DEVICE(ms->sclp), NULL, &error_fatal);
+
/* init memory + setup max page size. Required for the CPU model */
s390_memory_init(machine->ram);
}
/* qemu object creation and initialization functions */
-
-void s390_sclp_init(void)
-{
- Object *new = object_new(TYPE_SCLP);
-
- object_property_add_child(qdev_get_machine(), TYPE_SCLP, new);
- object_unref(new);
- qdev_realize(DEVICE(new), NULL, &error_fatal);
-}
-
static void sclp_realize(DeviceState *dev, Error **errp)
{
MachineState *machine = MACHINE(qdev_get_machine());
#include "hw/boards.h"
#include "qom/object.h"
+#include "hw/s390x/sclp.h"
#define TYPE_S390_CCW_MACHINE "s390-ccw-machine"
bool dea_key_wrap;
bool pv;
uint8_t loadparm[8];
+
+ SCLPDevice *sclp;
};
#define S390_PTF_REASON_NONE (0x00 << 8)
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);