Revision 2217dcff hw/pci.c

b/hw/pci.c
745 745
    const pci_class_desc *desc;
746 746

  
747 747
    monitor_printf(mon, "  Bus %2d, device %3d, function %d:\n",
748
                   d->bus->bus_num, d->devfn >> 3, d->devfn & 7);
748
                   d->bus->bus_num, PCI_SLOT(d->devfn), PCI_FUNC(d->devfn));
749 749
    class = le16_to_cpu(*((uint16_t *)(d->config + PCI_CLASS_DEVICE)));
750 750
    monitor_printf(mon, "    ");
751 751
    desc = pci_class_descriptions;
......
1111 1111
    monitor_printf(mon, "%*sclass %s, addr %02x:%02x.%x, "
1112 1112
                   "pci id %04x:%04x (sub %04x:%04x)\n",
1113 1113
                   indent, "", ctxt,
1114
                   d->bus->bus_num, d->devfn >> 3, d->devfn & 7,
1114
                   d->bus->bus_num, PCI_SLOT(d->devfn), PCI_FUNC(d->devfn),
1115 1115
                   le16_to_cpu(*((uint16_t *)(d->config + PCI_VENDOR_ID))),
1116 1116
                   le16_to_cpu(*((uint16_t *)(d->config + PCI_DEVICE_ID))),
1117 1117
                   le16_to_cpu(*((uint16_t *)(d->config + PCI_SUBSYSTEM_VENDOR_ID))),

Also available in: Unified diff