Commit df93b194 authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael S. Tsirkin
Browse files

acpi/pcihp: Convert debug printf()s to trace events 



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190402161900.7374-3-armbru@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent b37d56ec

hw/acpi/pcihp.c

+8 −17
Original line number Diff line number Diff line
@@ -37,14 +37,7 @@ 
#include "hw/pci/pci_bus.h"

#include "qapi/error.h"

#include "qom/qom-qobject.h"



//#define DEBUG



#ifdef DEBUG

# define ACPI_PCIHP_DPRINTF(format, ...)     printf(format, ## __VA_ARGS__)

#else

# define ACPI_PCIHP_DPRINTF(format, ...)     do { } while (0)

#endif

#include "trace.h"



#define ACPI_PCIHP_ADDR 0xae00

#define ACPI_PCIHP_SIZE 0x0014
@@ -306,23 +299,23 @@ static uint64_t pci_read(void *opaque, hwaddr addr, unsigned int size) 
        if (!s->legacy_piix) {

            s->acpi_pcihp_pci_status[bsel].up = 0;

        }

        ACPI_PCIHP_DPRINTF("pci_up_read %" PRIu32 "\n", val);

        trace_acpi_pci_up_read(val);

        break;

    case PCI_DOWN_BASE:

        val = s->acpi_pcihp_pci_status[bsel].down;

        ACPI_PCIHP_DPRINTF("pci_down_read %" PRIu32 "\n", val);

        trace_acpi_pci_down_read(val);

        break;

    case PCI_EJ_BASE:

        /* No feature defined yet */

        ACPI_PCIHP_DPRINTF("pci_features_read %" PRIu32 "\n", val);

        trace_acpi_pci_features_read(val);

        break;

    case PCI_RMV_BASE:

        val = s->acpi_pcihp_pci_status[bsel].hotplug_enable;

        ACPI_PCIHP_DPRINTF("pci_rmv_read %" PRIu32 "\n", val);

        trace_acpi_pci_rmv_read(val);

        break;

    case PCI_SEL_BASE:

        val = s->hotplug_select;

        ACPI_PCIHP_DPRINTF("pci_sel_read %" PRIu32 "\n", val);

        trace_acpi_pci_sel_read(val);

    default:

        break;

    }
@@ -340,13 +333,11 @@ static void pci_write(void *opaque, hwaddr addr, uint64_t data, 
            break;

        }

        acpi_pcihp_eject_slot(s, s->hotplug_select, data);

        ACPI_PCIHP_DPRINTF("pciej write %" HWADDR_PRIx " <== %" PRIu64 "\n",

                      addr, data);

        trace_acpi_pci_ej_write(addr, data);

        break;

    case PCI_SEL_BASE:

        s->hotplug_select = s->legacy_piix ? ACPI_PCIHP_BSEL_DEFAULT : data;

        ACPI_PCIHP_DPRINTF("pcisel write %" HWADDR_PRIx " <== %" PRIu64 "\n",

                      addr, data);

        trace_acpi_pci_sel_write(addr, data);

    default:

        break;

    }

hw/acpi/trace-events

+9 −0
Original line number Diff line number Diff line
@@ -31,6 +31,15 @@ cpuhp_acpi_ejecting_cpu(uint32_t idx) "0x%"PRIx32 
cpuhp_acpi_write_ost_ev(uint32_t slot, uint32_t ev) "idx[0x%"PRIx32"] OST EVENT: 0x%"PRIx32

cpuhp_acpi_write_ost_status(uint32_t slot, uint32_t st) "idx[0x%"PRIx32"] OST STATUS: 0x%"PRIx32



# pcihp.c

acpi_pci_up_read(uint32_t val) "%" PRIu32

acpi_pci_down_read(uint32_t val) "%" PRIu32

acpi_pci_features_read(uint32_t val) "%" PRIu32

acpi_pci_rmv_read(uint32_t val) "%" PRIu32

acpi_pci_sel_read(uint32_t val) "%" PRIu32

acpi_pci_ej_write(uint64_t addr, uint64_t data) "0x%" PRIx64 " <== %" PRIu64

acpi_pci_sel_write(uint64_t addr, uint64_t data) "0x%" PRIx64 " <== %" PRIu64



# piix4.c

piix4_gpe_readb(uint64_t addr, unsigned width, uint64_t val) "addr: 0x%" PRIx64 " width: %d ==> 0x%" PRIx64

piix4_gpe_writeb(uint64_t addr, unsigned width, uint64_t val) "addr: 0x%" PRIx64 " width: %d <== 0x%" PRIx64