Commit 0501e1aa authored by Julia Suvorova's avatar Julia Suvorova Committed by Michael S. Tsirkin
Browse files

hw/pci/pcie: Forbid hot-plug if it's disabled on the slot 



Raise an error when trying to hot-plug/unplug a device through QMP to a device
with disabled hot-plug capability. This makes the device behaviour more
consistent and provides an explanation of the failure in the case of
asynchronous unplug.

Signed-off-by: default avatarJulia Suvorova <jusual@redhat.com>
Message-Id: <20200427182440.92433-2-jusual@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarMarcel Apfelbaum <marcel.apfelbaum@gmail.com>
parent 9af638cc

hw/pci/pcie.c

+19 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, 
{

    PCIDevice *hotplug_pdev = PCI_DEVICE(hotplug_dev);

    uint8_t *exp_cap = hotplug_pdev->config + hotplug_pdev->exp.exp_cap;

    uint32_t sltcap = pci_get_word(exp_cap + PCI_EXP_SLTCAP);

    PCIDevice *pci_dev = PCI_DEVICE(dev);



    /* Don't send event when device is enabled during qemu machine creation:
@@ -430,6 +431,13 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, 
        return;

    }



    /* Check if hot-plug is disabled on the slot */

    if ((sltcap & PCI_EXP_SLTCAP_HPC) == 0) {

        error_setg(errp, "Hot-plug failed: unsupported by the port device '%s'",

                         DEVICE(hotplug_pdev)->id);

        return;

    }



    /* To enable multifunction hot-plug, we just ensure the function

     * 0 added last. When function 0 is added, we set the sltsta and

     * inform OS via event notification.
@@ -470,6 +478,17 @@ void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev, 
    Error *local_err = NULL;

    PCIDevice *pci_dev = PCI_DEVICE(dev);

    PCIBus *bus = pci_get_bus(pci_dev);

    PCIDevice *hotplug_pdev = PCI_DEVICE(hotplug_dev);

    uint8_t *exp_cap = hotplug_pdev->config + hotplug_pdev->exp.exp_cap;

    uint32_t sltcap = pci_get_word(exp_cap + PCI_EXP_SLTCAP);



    /* Check if hot-unplug is disabled on the slot */

    if ((sltcap & PCI_EXP_SLTCAP_HPC) == 0) {

        error_setg(errp, "Hot-unplug failed: "

                         "unsupported by the port device '%s'",

                         DEVICE(hotplug_pdev)->id);

        return;

    }



    pcie_cap_slot_plug_common(PCI_DEVICE(hotplug_dev), dev, &local_err);

    if (local_err) {