[Qemu-devel] Re: [PATCH 05/25] pci: use PCI_SLOT() and PCI_FUNC().

[Michael S. Tsirkin]

On Sat, Oct 03, 2009 at 05:15:57AM +0900, Isaku Yamahata wrote:
> use PCI_SLOT() and PCI_FUNC() where appropriate instead of
> direct use of bit operation.
> 
> Signed-off-by: Isaku Yamahata <address@hidden>

Acked-by: Michael S. Tsirkin <address@hidden>

> ---
>  hw/pci.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/pci.c b/hw/pci.c
> index 1016893..3bbc7e3 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -703,7 +703,7 @@ static void pci_info_device(PCIDevice *d)
>      const pci_class_desc *desc;
>  
>      monitor_printf(mon, "  Bus %2d, device %3d, function %d:\n",
> -                   d->bus->bus_num, d->devfn >> 3, d->devfn & 7);
> +                   d->bus->bus_num, PCI_SLOT(d->devfn), PCI_FUNC(d->devfn));
>      class = le16_to_cpu(*((uint16_t *)(d->config + PCI_CLASS_DEVICE)));
>      monitor_printf(mon, "    ");
>      desc = pci_class_descriptions;
> @@ -1039,7 +1039,7 @@ static void pcibus_dev_print(Monitor *mon, DeviceState 
> *dev, int indent)
>      monitor_printf(mon, "%*sclass %s, addr %02x:%02x.%x, "
>                     "pci id %04x:%04x (sub %04x:%04x)\n",
>                     indent, "", ctxt,
> -                   d->bus->bus_num, d->devfn >> 3, d->devfn & 7,
> +                   d->bus->bus_num, PCI_SLOT(d->devfn), PCI_FUNC(d->devfn),
>                     le16_to_cpu(*((uint16_t *)(d->config + PCI_VENDOR_ID))),
>                     le16_to_cpu(*((uint16_t *)(d->config + PCI_DEVICE_ID))),
>                     le16_to_cpu(*((uint16_t *)(d->config + 
> PCI_SUBSYSTEM_VENDOR_ID))),
> -- 
> 1.6.0.2
> 
>