SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s390x: Introduce a SCLPDevice pointer under the machine

Browse Source 
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>
This commit is contained in:
Cédric Le Goater 2024-05-02 15:15:31 +02:00 committed by Thomas Huth
parent c990c1f35b
commit b350f6c8ed
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/s390x/s390-virtio-ccw.c
View File

@ -251,11 +251,15 @@ static void s390_create_sclpconsole(const char *type, Chardev *chardev)
static void ccw_init(MachineState *machine) static void ccw_init(MachineState *machine)
{ {
MachineClass *mc = MACHINE_GET_CLASS(machine); MachineClass *mc = MACHINE_GET_CLASS(machine);
S390CcwMachineState *ms = S390_CCW_MACHINE(machine);
int ret; int ret;
VirtualCssBus *css_bus; VirtualCssBus *css_bus;
DeviceState *dev; 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 */ /* init memory + setup max page size. Required for the CPU model */
s390_memory_init(machine->ram); s390_memory_init(machine->ram);

10
hw/s390x/sclp.c
View File

@ -378,16 +378,6 @@ void sclp_service_interrupt(uint32_t sccb)
} }
/* qemu object creation and initialization functions */ /* 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) static void sclp_realize(DeviceState *dev, Error **errp)
{ {
MachineState *machine = MACHINE(qdev_get_machine()); MachineState *machine = MACHINE(qdev_get_machine());

3
include/hw/s390x/s390-virtio-ccw.h
View File

@ -13,6 +13,7 @@
#include "hw/boards.h" #include "hw/boards.h"
#include "qom/object.h" #include "qom/object.h"
#include "hw/s390x/sclp.h"
#define TYPE_S390_CCW_MACHINE "s390-ccw-machine" #define TYPE_S390_CCW_MACHINE "s390-ccw-machine"
@ -28,6 +29,8 @@ struct S390CcwMachineState {
bool dea_key_wrap; bool dea_key_wrap;
bool pv; bool pv;
uint8_t loadparm[8]; uint8_t loadparm[8];
SCLPDevice *sclp;
}; };
#define S390_PTF_REASON_NONE (0x00 << 8) #define S390_PTF_REASON_NONE (0x00 << 8)

2
include/hw/s390x/sclp.h
View File

@ -221,8 +221,6 @@ static inline int sccb_data_len(SCCB *sccb)
return be16_to_cpu(sccb->h.length) - sizeof(sccb->h); return be16_to_cpu(sccb->h.length) - sizeof(sccb->h);
} }
void s390_sclp_init(void);
void sclp_service_interrupt(uint32_t sccb); void sclp_service_interrupt(uint32_t sccb);
void raise_irq_cpu_hotplug(void); void raise_irq_cpu_hotplug(void);
int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint32_t code); int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint32_t code);