Commit 158e17a6 authored by Greg Kurz's avatar Greg Kurz Committed by David Gibson
Browse files

ppc/pnv: Link "chip" property to PnvCore::chip pointer 



The core object has both a pointer and a "chip" property pointing to the
chip object. Confusing bugs could arise if these ever go out of sync.

Change the property definition so that it explicitely sets the pointer.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Message-Id: <157383336007.165747.1524120147081367440.stgit@bahia.lan>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent f2582acf

hw/ppc/pnv.c

+2 −2
Original line number Diff line number Diff line
@@ -1327,8 +1327,8 @@ static void pnv_chip_core_realize(PnvChip *chip, Error **errp) 
        object_property_set_int(OBJECT(pnv_core),

                                pcc->core_pir(chip, core_hwid),

                                "pir", &error_fatal);

        object_property_add_const_link(OBJECT(pnv_core), "chip",

                                       OBJECT(chip), &error_fatal);

        object_property_set_link(OBJECT(pnv_core), OBJECT(chip), "chip",

                                 &error_abort);

        object_property_set_bool(OBJECT(pnv_core), true, "realized",

                                 &error_fatal);

hw/ppc/pnv_core.c

+2 −8
Original line number Diff line number Diff line
@@ -217,15 +217,8 @@ static void pnv_core_realize(DeviceState *dev, Error **errp) 
    void *obj;

    int i, j;

    char name[32];

    Object *chip;



    chip = object_property_get_link(OBJECT(dev), "chip", &local_err);

    if (!chip) {

        error_propagate_prepend(errp, local_err,

                                "required link 'chip' not found: ");

        return;

    }

    pc->chip = PNV_CHIP(chip);

    assert(pc->chip);



    pc->threads = g_new(PowerPCCPU *, cc->nr_threads);

    for (i = 0; i < cc->nr_threads; i++) {
@@ -297,6 +290,7 @@ static void pnv_core_unrealize(DeviceState *dev, Error **errp) 


static Property pnv_core_properties[] = {

    DEFINE_PROP_UINT32("pir", PnvCore, pir, 0),

    DEFINE_PROP_LINK("chip", PnvCore, chip, TYPE_PNV_CHIP, PnvChip *),

    DEFINE_PROP_END_OF_LIST(),

};