conf: make virDomainControllerFindUnusedIndex() more generally usable

Make virDomainControllerFindUnusedIndex() a global function so that it
can be used outside domain_conf.c (as well as higher up in
domain_conf.c itself)/ Also make its DomainDef arg a const* so that
functions which only have a const* to the domain can use it.

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e5c355eb1948e5591a7d86127204df47c32f30c4..50d1d94935adf9eba3e1f3f2bd7e916292e8d3b6 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13717,8 +13717,8 @@ virDomainControllerFind(const virDomainDef *def,
 }
 
 
-static int
-virDomainControllerFindUnusedIndex(virDomainDefPtr def, int type)
+int
+virDomainControllerFindUnusedIndex(virDomainDef const *def, int type)
 {
     int idx = 0;
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 0cc82d81164a456cf0284b08f3a59e251d8c3a7c..0d97003a91937db0e3cdf2dae7e5f3b464d78f3d 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2755,6 +2755,7 @@ int virDomainControllerFind(const virDomainDef *def, int type, int idx);
 int virDomainControllerFindByType(virDomainDefPtr def, int type);
 int virDomainControllerFindByPCIAddress(virDomainDefPtr def,
                                         virPCIDeviceAddressPtr addr);
+int virDomainControllerFindUnusedIndex(virDomainDef const *def, int type);
 virDomainControllerDefPtr virDomainControllerRemove(virDomainDefPtr def, size_t i);
 const char *virDomainControllerAliasFind(const virDomainDef *def,
                                          int type, int idx)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index fb5b419d1fa2ac2b2911ebc3b643a0535bdf0a0e..e325168e539f7ba3cee067e998c6b56fe8fcf2c5 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -189,6 +189,7 @@ virDomainControllerDefFree;
 virDomainControllerDefNew;
 virDomainControllerFind;
 virDomainControllerFindByType;
+virDomainControllerFindUnusedIndex;
 virDomainControllerInsert;
 virDomainControllerInsertPreAlloced;
 virDomainControllerModelPCITypeToString;