Commit 9fc380d3 authored by Michael Ellerman's avatar Michael Ellerman Committed by Alexander Graf
Browse files

pseries: Check for duplicate addresses on the spapr-vio bus 



Check that devices on the spapr vio bus aren't given duplicate
addresses. Currently we will not run with duplicate devices, the
fdt code will spot it, but the error reporting is not great. With
this patch we can report the error nicely in terms of the device
names given by the user.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 68f3a94c

hw/spapr_vio.c

+32 −0
Original line number Diff line number Diff line
@@ -621,11 +621,43 @@ static void rtas_quiesce(sPAPREnvironment *spapr, uint32_t token, 
    rtas_st(rets, 0, 0);

}



static int spapr_vio_check_reg(VIOsPAPRDevice *sdev, VIOsPAPRDeviceInfo *info)

{

    VIOsPAPRDevice *other_sdev;

    DeviceState *qdev;

    VIOsPAPRBus *sbus;



    sbus = DO_UPCAST(VIOsPAPRBus, bus, sdev->qdev.parent_bus);



    /*

     * Check two device aren't given clashing addresses by the user (or some

     * other mechanism). We have to open code this because we have to check

     * for matches with devices other than us.

     */

    QTAILQ_FOREACH(qdev, &sbus->bus.children, sibling) {

        other_sdev = DO_UPCAST(VIOsPAPRDevice, qdev, qdev);



        if (other_sdev != sdev && other_sdev->reg == sdev->reg) {

            fprintf(stderr, "vio: %s and %s devices conflict at address %#x\n",

                    info->qdev.name, other_sdev->qdev.info->name, sdev->reg);

            return -EEXIST;

        }

    }



    return 0;

}



static int spapr_vio_busdev_init(DeviceState *qdev, DeviceInfo *qinfo)

{

    VIOsPAPRDeviceInfo *info = (VIOsPAPRDeviceInfo *)qinfo;

    VIOsPAPRDevice *dev = (VIOsPAPRDevice *)qdev;

    char *id;

    int ret;



    ret = spapr_vio_check_reg(dev, info);

    if (ret) {

        return ret;

    }



    /* Don't overwrite ids assigned on the command line */

    if (!dev->qdev.id) {