[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] build: fix build of HAL node backend



On Tue, Feb 05, 2013 at 04:21:26PM -0700, Eric Blake wrote:
> Commit 2025356 missed uses of PCI functions in the older HAL-related
> code, probably because hal-devel is no longer available in latest Fedora.
> 
> * src/node_device/node_device_hal.c (gather_pci_cap): Reflect
> function rename.
> ---
> 
> Pushing under the build-breaker rule.
> 
>  src/node_device/node_device_hal.c |    8 +++++---
>  1 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
> index 610df8d..2ecb1de 100644
> --- a/src/node_device/node_device_hal.c
> +++ b/src/node_device/node_device_hal.c
> @@ -1,7 +1,7 @@
>  /*
>   * node_device_hal.c: node device enumeration - HAL-based implementation
>   *
> - * Copyright (C) 2011 Red Hat, Inc.
> + * Copyright (C) 2011, 2013 Red Hat, Inc.
>   * Copyright (C) 2008 Virtual Iron Software, Inc.
>   * Copyright (C) 2008 David F. Lively
>   *
> @@ -148,10 +148,12 @@ static int gather_pci_cap(LibHalContext *ctx, const char *udi,
>              (void)virStrToLong_ui(p+1, &p, 16, &d->pci_dev.function);
>          }
> 
> -        if (!pciGetPhysicalFunction(sysfs_path, &d->pci_dev.physical_function))
> +        if (!virPCIGetPhysicalFunction(sysfs_path,
> +                                       &d->pci_dev.physical_function))
>              d->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION;
> 
> -        if (!pciGetVirtualFunctions(sysfs_path, &d->pci_dev.virtual_functions,
> +        if (!virPCIGetVirtualFunctions(sysfs_path,
> +                                       &d->pci_dev.virtual_functions,
>              &d->pci_dev.num_virtual_functions) ||
>              d->pci_dev.num_virtual_functions > 0)
>              d->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION;

ACK, you beat me to it

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]