Re: [Xen-devel] [PATCH 4/6] make passthrough/pci.c:deassign_device() static

[Jan Beulich <jbeulich@xxxxxxxx>]

On 30.07.2019 15:44, Paul Durrant wrote:
> This function is only ever called from within the same source module and
> really has no business being declared xen/iommu.h. This patch relocates
> the function ahead of the first called and makes it static.
>
> Signed-off-by: Paul Durrant <paul.durrant@xxxxxxxxxx>
Acked-by: Jan Beulich <jbeulich@xxxxxxxx>

But of course it would have been nice if some minimal and obvious
style corrections were done at the same time:

> --- a/xen/drivers/passthrough/pci.c
> +++ b/xen/drivers/passthrough/pci.c
> @@ -889,6 +889,52 @@ static int pci_clean_dpci_irqs(struct domain *d)
>       return 0;
>   }
>   
> +/* caller should hold the pcidevs_lock */
> +static int deassign_device(struct domain *d, u16 seg, u8 bus, u8 devfn)
uint<N>_t

> +{
> +    const struct domain_iommu *hd = dom_iommu(d);
> +    struct pci_dev *pdev = NULL;
stray initializer

> +    int ret = 0;
> +
> +    if ( !is_iommu_enabled(d) )
> +        return -EINVAL;
> +
> +    ASSERT(pcidevs_locked());
> +    pdev = pci_get_pdev_by_domain(d, seg, bus, devfn);
> +    if ( !pdev )
> +        return -ENODEV;
> +
> +    while ( pdev->phantom_stride )
> +    {
> +        devfn += pdev->phantom_stride;
> +        if ( PCI_SLOT(devfn) != PCI_SLOT(pdev->devfn) )
> +            break;
> +        ret = hd->platform_ops->reassign_device(d, hardware_domain, devfn,
> +                                                pci_to_dev(pdev));
> +        if ( !ret )
> +            continue;
> +
> +        printk(XENLOG_G_ERR "d%d: deassign %04x:%02x:%02x.%u failed (%d)\n",
> +               d->domain_id, seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), ret);
(less "minimal") use %pd (also once more below)

Jan

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel