On Tue, 2 Apr 2019 18:19:00 +0200
Markus Armbruster <arm...@redhat.com> wrote:
> Signed-off-by: Markus Armbruster <arm...@redhat.com>
Reviewed-by: Markus Armbruster <arm...@redhat.com>
> ---
> hw/acpi/pcihp.c | 7 +++++++
> hw/acpi/trace-events | 3 +++
> 2 files changed, 10 insertions(+)
>
> diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
> index 7729c5338b..613406d09b 100644
> --- a/hw/acpi/pcihp.c
> +++ b/hw/acpi/pcihp.c
> @@ -152,6 +152,8 @@ static void acpi_pcihp_eject_slot(AcpiPciHpState *s,
> unsigned bsel, unsigned slo
> int slot = ctz32(slots);
> PCIBus *bus = acpi_pcihp_find_hotplug_bus(s, bsel);
>
> + trace_acpi_pci_eject_slot(bsel, slot);
> +
> if (!bus) {
> return;
> }
> @@ -263,6 +265,8 @@ void acpi_pcihp_device_plug_cb(HotplugHandler
> *hotplug_dev, AcpiPciHpState *s,
> void acpi_pcihp_device_unplug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState
> *s,
> DeviceState *dev, Error **errp)
> {
> + trace_acpi_pci_unplug(PCI_SLOT(PCI_DEVICE(dev)->devfn),
> + acpi_pcihp_get_bsel(pci_get_bus(PCI_DEVICE(dev))));
> object_property_set_bool(OBJECT(dev), false, "realized", NULL);
> }
>
> @@ -273,6 +277,9 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler
> *hotplug_dev,
> PCIDevice *pdev = PCI_DEVICE(dev);
> int slot = PCI_SLOT(pdev->devfn);
> int bsel = acpi_pcihp_get_bsel(pci_get_bus(pdev));
> +
> + trace_acpi_pci_unplug_request(bsel, slot);
> +
> if (bsel < 0) {
> error_setg(errp, "Unsupported bus. Bus doesn't have property '"
> ACPI_PCIHP_PROP_BSEL "' set");
> diff --git a/hw/acpi/trace-events b/hw/acpi/trace-events
> index 98a56baa6f..96b8273297 100644
> --- a/hw/acpi/trace-events
> +++ b/hw/acpi/trace-events
> @@ -32,6 +32,9 @@ cpuhp_acpi_write_ost_ev(uint32_t slot, uint32_t ev)
> "idx[0x%"PRIx32"] OST EVENT:
> cpuhp_acpi_write_ost_status(uint32_t slot, uint32_t st) "idx[0x%"PRIx32"]
> OST STATUS: 0x%"PRIx32
>
> # pcihp.c
> +acpi_pci_eject_slot(unsigned bsel, unsigned slot) "bsel: %u slot: %u"
> +acpi_pci_unplug(int bsel, int slot) "bsel: %d slot: %d"
> +acpi_pci_unplug_request(int bsel, int slot) "bsel: %d slot: %d"
> acpi_pci_up_read(uint32_t val) "%" PRIu32
> acpi_pci_down_read(uint32_t val) "%" PRIu32
> acpi_pci_features_read(uint32_t val) "%" PRIu32
