Commit 7ad36e2e authored by Markus Armbruster's avatar Markus Armbruster Committed by Thomas Huth
Browse files

hw: Mark nd_table[] misuse in realize methods FIXME 



nd_table[] contains NIC configuration for boards to pick up.  Device
code has no business looking there.  Several devices do it anyway.
Two of them already have a suitable FIXME comment: "allwinner-a10" and
"msf2-soc".  Copy it to the others: "allwinner-h3", "xlnx-versal",
"xlnx,zynqmp", "sparc32-ledma", "riscv.sifive.u.soc".

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20200715140440.3540942-3-armbru@redhat.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Reviewed-by: default avatarNiek Linnenbank <nieklinnenbank@gmail.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 2b065020

hw/arm/allwinner-h3.c

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp) 
                              "sd-bus");



    /* EMAC */

    /* FIXME use qdev NIC properties instead of nd_table[] */

    if (nd_table[0].used) {

        qemu_check_nic_model(&nd_table[0], TYPE_AW_SUN8I_EMAC);

        qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);

hw/arm/xlnx-versal.c

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ static void versal_create_gems(Versal *s, qemu_irq *pic) 
        object_initialize_child(OBJECT(s), name, &s->lpd.iou.gem[i],

                                TYPE_CADENCE_GEM);

        dev = DEVICE(&s->lpd.iou.gem[i]);

        /* FIXME use qdev NIC properties instead of nd_table[] */

        if (nd->used) {

            qemu_check_nic_model(nd, "cadence_gem");

            qdev_set_nic_properties(dev, nd);

hw/arm/xlnx-zynqmp.c

+1 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
    for (i = 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) {

        NICInfo *nd = &nd_table[i];



        /* FIXME use qdev NIC properties instead of nd_table[] */

        if (nd->used) {

            qemu_check_nic_model(nd, TYPE_CADENCE_GEM);

            qdev_set_nic_properties(DEVICE(&s->gem[i]), nd);

hw/dma/sparc32_dma.c

+1 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ static void sparc32_ledma_device_realize(DeviceState *dev, Error **errp) 
    DeviceState *d;

    NICInfo *nd = &nd_table[0];



    /* FIXME use qdev NIC properties instead of nd_table[] */

    qemu_check_nic_model(nd, TYPE_LANCE);



    d = qdev_new(TYPE_LANCE);

hw/riscv/sifive_u.c

+1 −0
Original line number Diff line number Diff line
@@ -714,6 +714,7 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp) 
    }

    sysbus_mmio_map(SYS_BUS_DEVICE(&s->otp), 0, memmap[SIFIVE_U_OTP].base);



    /* FIXME use qdev NIC properties instead of nd_table[] */

    if (nd->used) {

        qemu_check_nic_model(nd, TYPE_CADENCE_GEM);

        qdev_set_nic_properties(DEVICE(&s->gem), nd);