[libvirt] [PATCH RFC 11/40] conf: Remove unused virDomainDiskFindByBusAndDst

Peter Krempa posted 40 patches 6 years, 2 months ago
[libvirt] [PATCH RFC 11/40] conf: Remove unused virDomainDiskFindByBusAndDst
Posted by Peter Krempa 6 years, 2 months ago
Previous commit removed last use of this function so we can get rid of
it.t

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 src/conf/domain_conf.c   | 21 ---------------------
 src/conf/domain_conf.h   |  3 ---
 src/libvirt_private.syms |  1 -
 3 files changed, 25 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1fffd56a22..e12d676a8c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8566,27 +8566,6 @@ virDomainDeviceFindSCSIController(const virDomainDef *def,
     return NULL;
 }

-virDomainDiskDefPtr
-virDomainDiskFindByBusAndDst(virDomainDefPtr def,
-                             int bus,
-                             char *dst)
-{
-    size_t i;
-
-    if (!dst)
-        return NULL;
-
-    for (i = 0; i < def->ndisks; i++) {
-        if (def->disks[i]->bus == bus &&
-            STREQ(def->disks[i]->dst, dst)) {
-            return def->disks[i];
-        }
-    }
-
-    return NULL;
-}
-
-
 int
 virDomainDiskDefAssignAddress(virDomainXMLOptionPtr xmlopt,
                               virDomainDiskDefPtr def,
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 690aa3c84b..071de9e71e 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2859,9 +2859,6 @@ void virDomainDiskSetFormat(virDomainDiskDefPtr def, int format);
 virDomainControllerDefPtr
 virDomainDeviceFindSCSIController(const virDomainDef *def,
                                   virDomainDeviceInfoPtr info);
-virDomainDiskDefPtr virDomainDiskFindByBusAndDst(virDomainDefPtr def,
-                                                 int bus,
-                                                 char *dst);

 virDomainControllerDefPtr virDomainControllerDefNew(virDomainControllerType type);
 void virDomainControllerDefFree(virDomainControllerDefPtr def);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 2379c1ed8b..fdfe1e7295 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -345,7 +345,6 @@ virDomainDiskDiscardTypeToString;
 virDomainDiskEmptySource;
 virDomainDiskErrorPolicyTypeFromString;
 virDomainDiskErrorPolicyTypeToString;
-virDomainDiskFindByBusAndDst;
 virDomainDiskGeometryTransTypeFromString;
 virDomainDiskGeometryTransTypeToString;
 virDomainDiskGetDetectZeroesMode;
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH RFC 11/40] conf: Remove unused virDomainDiskFindByBusAndDst
Posted by Daniel Henrique Barboza 6 years, 2 months ago

On 10/18/19 1:10 PM, Peter Krempa wrote:
> Previous commit removed last use of this function so we can get rid of
> it.t

Extra 't' at the end


Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

> 
> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> ---
>   src/conf/domain_conf.c   | 21 ---------------------
>   src/conf/domain_conf.h   |  3 ---
>   src/libvirt_private.syms |  1 -
>   3 files changed, 25 deletions(-)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 1fffd56a22..e12d676a8c 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -8566,27 +8566,6 @@ virDomainDeviceFindSCSIController(const virDomainDef *def,
>       return NULL;
>   }
> 
> -virDomainDiskDefPtr
> -virDomainDiskFindByBusAndDst(virDomainDefPtr def,
> -                             int bus,
> -                             char *dst)
> -{
> -    size_t i;
> -
> -    if (!dst)
> -        return NULL;
> -
> -    for (i = 0; i < def->ndisks; i++) {
> -        if (def->disks[i]->bus == bus &&
> -            STREQ(def->disks[i]->dst, dst)) {
> -            return def->disks[i];
> -        }
> -    }
> -
> -    return NULL;
> -}
> -
> -
>   int
>   virDomainDiskDefAssignAddress(virDomainXMLOptionPtr xmlopt,
>                                 virDomainDiskDefPtr def,
> diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
> index 690aa3c84b..071de9e71e 100644
> --- a/src/conf/domain_conf.h
> +++ b/src/conf/domain_conf.h
> @@ -2859,9 +2859,6 @@ void virDomainDiskSetFormat(virDomainDiskDefPtr def, int format);
>   virDomainControllerDefPtr
>   virDomainDeviceFindSCSIController(const virDomainDef *def,
>                                     virDomainDeviceInfoPtr info);
> -virDomainDiskDefPtr virDomainDiskFindByBusAndDst(virDomainDefPtr def,
> -                                                 int bus,
> -                                                 char *dst);
> 
>   virDomainControllerDefPtr virDomainControllerDefNew(virDomainControllerType type);
>   void virDomainControllerDefFree(virDomainControllerDefPtr def);
> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
> index 2379c1ed8b..fdfe1e7295 100644
> --- a/src/libvirt_private.syms
> +++ b/src/libvirt_private.syms
> @@ -345,7 +345,6 @@ virDomainDiskDiscardTypeToString;
>   virDomainDiskEmptySource;
>   virDomainDiskErrorPolicyTypeFromString;
>   virDomainDiskErrorPolicyTypeToString;
> -virDomainDiskFindByBusAndDst;
>   virDomainDiskGeometryTransTypeFromString;
>   virDomainDiskGeometryTransTypeToString;
>   virDomainDiskGetDetectZeroesMode;
> 

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list