Commit 4db49dc0 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Anthony Liguori
Browse files

refactor drive_hot_add 



move pci device lookup into the "case IF_SCSI" section, so we
can do something else for other interface types.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 56a14938

hw/pci-hotplug.c

+19 −19
Original line number Diff line number Diff line
@@ -58,48 +58,48 @@ void drive_hot_add(Monitor *mon, const QDict *qdict) 
    int dom, pci_bus;

    unsigned slot;

    int type, bus;

    int success = 0;

    PCIDevice *dev;

    DriveInfo *dinfo;

    DriveInfo *dinfo = NULL;

    const char *pci_addr = qdict_get_str(qdict, "pci_addr");

    const char *opts = qdict_get_str(qdict, "opts");

    BusState *scsibus;



    if (pci_read_devaddr(mon, pci_addr, &dom, &pci_bus, &slot)) {

        return;

    }



    dev = pci_find_device(pci_bus, slot, 0);

    if (!dev) {

        monitor_printf(mon, "no pci device with address %s\n", pci_addr);

        return;

    }



    dinfo = add_init_drive(opts);

    if (!dinfo)

        return;

        goto err;

    if (dinfo->devaddr) {

        monitor_printf(mon, "Parameter addr not supported\n");

        return;

        goto err;

    }

    type = dinfo->type;

    bus = drive_get_max_bus (type);



    switch (type) {

    case IF_SCSI:

        success = 1;

        if (pci_read_devaddr(mon, pci_addr, &dom, &pci_bus, &slot)) {

            goto err;

        }

        dev = pci_find_device(pci_bus, slot, 0);

        if (!dev) {

            monitor_printf(mon, "no pci device with address %s\n", pci_addr);

            goto err;

        }

        scsibus = QLIST_FIRST(&dev->qdev.child_bus);

        scsi_bus_legacy_add_drive(DO_UPCAST(SCSIBus, qbus, scsibus),

                                  dinfo, dinfo->unit);

        monitor_printf(mon, "OK bus %d, unit %d\n",

                       dinfo->bus,

                       dinfo->unit);

        break;

    default:

        monitor_printf(mon, "Can't hot-add drive to type %d\n", type);

        goto err;

    }

    return;



    if (success)

        monitor_printf(mon, "OK bus %d, unit %d\n",

                       dinfo->bus,

                       dinfo->unit);

err:

    if (dinfo)

        drive_uninit(dinfo);

    return;

}