Commit 1bbadc75 authored by Greg Kurz's avatar Greg Kurz Committed by David Gibson
Browse files

spapr_cpu_core: fail gracefully with non-pseries machine types 



Since commit 7cca3e46 ("ppc: spapr: Move VCPU ID calculation into
sPAPR"), QEMU aborts when started with a *-spapr-cpu-core device and
a non-pseries machine.

Let's rely on the already existing call to object_dynamic_cast() instead
of using the SPAPR_MACHINE() macro.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent a1a6bbde

hw/ppc/spapr_cpu_core.c

+3 −2
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ error: 


static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)

{

    sPAPRMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());

    sPAPRMachineState *spapr;

    sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));

    sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev));

    CPUCore *cc = CPU_CORE(OBJECT(dev));
@@ -223,7 +223,8 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) 
    void *obj;

    int i, j;



    if (!object_dynamic_cast(qdev_get_machine(), TYPE_SPAPR_MACHINE)) {

    spapr = (sPAPRMachineState *) qdev_get_machine();

    if (!object_dynamic_cast((Object *) spapr, TYPE_SPAPR_MACHINE)) {

        error_setg(errp, "spapr-cpu-core needs a pseries machine");

        return;

    }