Commit 2313a88f authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/pci: Unplug remaining requested devices on pcihost reset 



When resetting the guest we should unplug and remove all devices that
are still pending.

With this patch, the requested device will be unplugged on reboot
(S390_RESET_EXTERNAL and S390_RESET_REIPL, which reset the pcihost bridge
via qemu_devices_reset()).

This approach is similar to what's done for acpi PCI hotplug in
acpi_pcihp_reset() -> acpi_pcihp_update() ->
acpi_pcihp_update_hotplug_bus() -> acpi_pcihp_eject_slot().

s390_pci_generate_plug_event()'s will still be generated, I guess this
is not an issue. The same thing would happen right now when unplugging
a device just before starting the guest.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20190130155733.32742-7-david@redhat.com>
Reviewed-by: default avatarCollin Walling <walling@linux.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 703fef6f

hw/s390x/s390-pci-bus.c

+15 −0
Original line number Diff line number Diff line
@@ -1093,6 +1093,21 @@ static void s390_pcihost_reset(DeviceState *dev) 
{

    S390pciState *s = S390_PCI_HOST_BRIDGE(dev);

    PCIBus *bus = s->parent_obj.bus;

    S390PCIBusDevice *pbdev, *next;



    /* Process all pending unplug requests */

    QTAILQ_FOREACH_SAFE(pbdev, &s->zpci_devs, link, next) {

        if (pbdev->unplug_requested) {

            if (pbdev->summary_ind) {

                pci_dereg_irqs(pbdev);

            }

            if (pbdev->iommu->enabled) {

                pci_dereg_ioat(pbdev->iommu);

            }

            pbdev->state = ZPCI_FS_STANDBY;

            s390_pci_perform_unplug(pbdev);

        }

    }



    /*

     * When resetting a PCI bridge, the assigned numbers are set to 0. So