Commit 2363d5ee authored by Thomas Huth's avatar Thomas Huth Committed by David Gibson
Browse files

hw/ppc/spapr_cpu_core: Add a proper check for spapr machine 



QEMU currently crashes when the user tries to add a spapr-cpu-core
on a non-pseries machine:

$ qemu-system-ppc64 -S -machine ppce500,accel=tcg \
                    -device POWER5+_v2.1-spapr-cpu-core
hw/ppc/spapr_cpu_core.c:178:spapr_cpu_core_realize_child:
Object 0x55cee1f55160 is not an instance of type spapr-machine
Aborted (core dumped)

So let's add a proper check for the correct machine time with
a more friendly error message here.

Reported-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 97c2acb5

hw/ppc/spapr_cpu_core.c

+5 −0
Original line number Diff line number Diff line
@@ -220,6 +220,11 @@ 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)) {

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

        return;

    }



    sc->threads = g_malloc0(size * cc->nr_threads);

    for (i = 0; i < cc->nr_threads; i++) {

        char id[32];

scripts/device-crash-test

+3 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ ERROR_WHITELIST = [ 
    {'machine':'q35|pc.*', 'device':'kvm-ioapic', 'expected':True}, # Only 1 ioapics allowed

    {'machine':'q35|pc.*', 'device':'ioapic', 'expected':True},     # Only 1 ioapics allowed



    # "spapr-cpu-core needs a pseries machine"

    {'machine':'(?!pseries).*', 'device':'.*-spapr-cpu-core', 'expected':True},



    # KVM-specific devices shouldn't be tried without accel=kvm:

    {'accel':'(?!kvm).*', 'device':'kvmclock', 'expected':True},

    {'accel':'(?!kvm).*', 'device':'kvm-pci-assign', 'expected':True},