[libvirt] [PATCH v2 1/3] conf: Move virDomainPCIAddressAsString() to util/virpci

Martin Kletzander mkletzan at redhat.com
Wed Sep 5 12:47:01 UTC 2018


On Wed, Sep 05, 2018 at 10:09:24AM +0200, Andrea Bolognani wrote:
>It's a better fit than conf/domain_conf.
>
>Signed-off-by: Andrea Bolognani <abologna at redhat.com>
>---
> src/conf/domain_addr.c   | 14 --------------
> src/conf/domain_addr.h   |  4 ----
> src/libvirt_private.syms |  2 +-
> src/util/virpci.c        | 13 +++++++++++++
> src/util/virpci.h        |  3 +++
> 5 files changed, 17 insertions(+), 19 deletions(-)
>
>diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
>index b62fd53c66..d2e1142462 100644
>--- a/src/conf/domain_addr.c
>+++ b/src/conf/domain_addr.c
>@@ -573,20 +573,6 @@ virDomainPCIAddressSetGrow(virDomainPCIAddressSetPtr addrs,
> }
>
>
>-char *
>-virDomainPCIAddressAsString(virPCIDeviceAddressPtr addr)
>-{
>-    char *str;
>-
>-    ignore_value(virAsprintf(&str, "%.4x:%.2x:%.2x.%.1x",
>-                             addr->domain,
>-                             addr->bus,
>-                             addr->slot,
>-                             addr->function));
>-    return str;
>-}
>-
>-
> /*
>  * Check if the PCI slot is used by another device.
>  */
>diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h
>index 5ad9d8ef3d..f8ab742715 100644
>--- a/src/conf/domain_addr.h
>+++ b/src/conf/domain_addr.h
>@@ -124,9 +124,6 @@ struct _virDomainPCIAddressSet {
> typedef struct _virDomainPCIAddressSet virDomainPCIAddressSet;
> typedef virDomainPCIAddressSet *virDomainPCIAddressSetPtr;
>
>-char *virDomainPCIAddressAsString(virPCIDeviceAddressPtr addr)
>-      ATTRIBUTE_NONNULL(1);
>-
> virDomainPCIAddressSetPtr virDomainPCIAddressSetAlloc(unsigned int nbuses);
>
> void virDomainPCIAddressSetFree(virDomainPCIAddressSetPtr addrs);
>@@ -138,7 +135,6 @@ bool virDomainPCIAddressValidate(virDomainPCIAddressSetPtr addrs,
>                                  bool fromConfig)
>      ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
>
>-

Separate this into trivial patch.

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20180905/ced4b030/attachment-0001.sig>


More information about the libvir-list mailing list