Commit 0d1c7d88 authored by Cao jin's avatar Cao jin Committed by Michael S. Tsirkin
Browse files

remove function during multi-function hot-add 



In case user want to cancel the hot-add operation, should roll back,
device_del the added function that still don`t work.

Signed-off-by: default avatarCao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 3595e2eb

hw/pci/pcie.c

+18 −5
Original line number Diff line number Diff line
@@ -261,13 +261,31 @@ void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, 
                        PCI_EXP_HP_EV_PDC | PCI_EXP_HP_EV_ABP);

}



static void pcie_unplug_device(PCIBus *bus, PCIDevice *dev, void *opaque)

{

    object_unparent(OBJECT(dev));

}



void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev,

                                         DeviceState *dev, Error **errp)

{

    uint8_t *exp_cap;

    PCIDevice *pci_dev = PCI_DEVICE(dev);

    PCIBus *bus = pci_dev->bus;



    pcie_cap_slot_hotplug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, errp);



    /* In case user cancel the operation of multi-function hot-add,

     * remove the function that is unexposed to guest individually,

     * without interaction with guest.

     */

    if (pci_dev->devfn &&

        !bus->devices[0]) {

        pcie_unplug_device(bus, pci_dev, NULL);



        return;

    }



    pcie_cap_slot_push_attention_button(PCI_DEVICE(hotplug_dev));

}
@@ -378,11 +396,6 @@ void pcie_cap_slot_reset(PCIDevice *dev) 
    hotplug_event_update_event_status(dev);

}



static void pcie_unplug_device(PCIBus *bus, PCIDevice *dev, void *opaque)

{

    object_unparent(OBJECT(dev));

}



void pcie_cap_slot_write_config(PCIDevice *dev,

                                uint32_t addr, uint32_t val, int len)

{