[libvirt] [PATCH v4 10/25] [ACKED] conf: make virDomainPCIAddressGetNextSlot() a local static function

Andrea Bolognani abologna at redhat.com
Tue Oct 18 14:46:15 UTC 2016


On Fri, 2016-10-14 at 15:54 -0400, Laine Stump wrote:
> This function is no longer needed outside of domain_addr.c.
> ---
>  src/conf/domain_addr.c   | 2 +-
>  src/conf/domain_addr.h   | 5 -----
>  src/libvirt_private.syms | 1 -
>  3 files changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
> index 1710220..3a9e474 100644
> --- a/src/conf/domain_addr.c
> +++ b/src/conf/domain_addr.c
> @@ -591,7 +591,7 @@ virDomainPCIAddressSetFree(virDomainPCIAddressSetPtr addrs)
>  }
>  
>  
> -int
> +static int
>  virDomainPCIAddressGetNextSlot(virDomainPCIAddressSetPtr addrs,
>                                 virPCIDeviceAddressPtr next_addr,
>                                 virDomainPCIConnectFlags flags)
> diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
> index 904d060..4d6d12a 100644
> --- a/src/conf/domain_addr.h
> +++ b/src/conf/domain_addr.h
> @@ -155,11 +155,6 @@ int virDomainPCIAddressReleaseSlot(virDomainPCIAddressSetPtr addrs,
>                                     virPCIDeviceAddressPtr addr)
>      ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
>  
> -int virDomainPCIAddressGetNextSlot(virDomainPCIAddressSetPtr addrs,
> -                                   virPCIDeviceAddressPtr next_addr,
> -                                   virDomainPCIConnectFlags flags)
> -    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);

As noted while reviewing v3, you're losing both
ATTRIBUTE_NONNULL() with this commit. I was probably not
clear enough last time around, sorry about that :(

ACK with the attributes properly carried over.

-- 
Andrea Bolognani / Red Hat / Virtualization




More information about the libvir-list mailing list