On 17/02/10 17:08, Daniel Veillard wrote:
>   Hum, virDomainDevicePCIAddressEqual is actually exposed in
> src/libvirt_private.syms so that would have to be cleaned up there too.
> If no ongoing patches is needing them I'm fine removeing those,

Hadn't spotted that. Attached new patch which touches
src/libvirt_private.syms.

Matt
-- 
Matthew Booth, RHCA, RHCSS
Red Hat Engineering, Virtualisation Team

M:       +44 (0)7977 267231
GPG ID:  D33C3490
GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490
>From 5612c7c7a5969a84cc97f50ad2bdf9070ef95210 Mon Sep 17 00:00:00 2001
From: Matthew Booth <mbo...@redhat.com>
Date: Wed, 17 Feb 2010 13:25:41 +0000
Subject: [PATCH] Remove unused functions from domain_conf

Remove virDomainDevicePCIAddressEqual and virDomainDeviceDriveAddressEqual,
which are defined but not used anywhere.

* src/conf/domain_conf.[ch]
  src/libvirt_private.syms: Remove virDomainDevicePCIAddressEqual and
                            virDomainDeviceDriveAddressEqual.
---
 src/conf/domain_conf.c   |   24 ------------------------
 src/conf/domain_conf.h   |    4 ----
 src/libvirt_private.syms |    1 -
 3 files changed, 0 insertions(+), 29 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 561fa22..59fd251 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -966,30 +966,6 @@ static int virDomainDeviceInfoFormat(virBufferPtr buf,
 
 #ifndef PROXY
 
-int virDomainDevicePCIAddressEqual(virDomainDevicePCIAddressPtr a,
-                                   virDomainDevicePCIAddressPtr b)
-{
-    if (a->domain == b->domain &&
-        a->bus    == b->bus &&
-        a->slot   == b->slot &&
-        a->function == b->function)
-        return 1;
-
-    return 0;
-}
-
-
-int virDomainDeviceDriveAddressEqual(virDomainDeviceDriveAddressPtr a,
-                                     virDomainDeviceDriveAddressPtr b)
-{
-    if (a->controller == b->controller &&
-        a->bus == b->bus &&
-        a->unit == b->unit)
-        return 1;
-
-    return 0;
-}
-
 
 static int
 virDomainDevicePCIAddressParseXML(xmlNodePtr node,
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 231d8c8..782af95 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -740,10 +740,6 @@ void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def);
 void virDomainVideoDefFree(virDomainVideoDefPtr def);
 void virDomainHostdevDefFree(virDomainHostdevDefPtr def);
 void virDomainDeviceDefFree(virDomainDeviceDefPtr def);
-int virDomainDevicePCIAddressEqual(virDomainDevicePCIAddressPtr a,
-                                   virDomainDevicePCIAddressPtr b);
-int virDomainDeviceDriveAddressEqual(virDomainDeviceDriveAddressPtr a,
-                                     virDomainDeviceDriveAddressPtr b);
 int virDomainDeviceAddressIsValid(virDomainDeviceInfoPtr info,
                                   int type);
 int virDomainDevicePCIAddressIsValid(virDomainDevicePCIAddressPtr addr);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index aa826d6..4dd7e98 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -179,7 +179,6 @@ virDomainObjListInit;
 virDomainObjListDeinit;
 virDomainObjRef;
 virDomainObjUnref;
-virDomainDevicePCIAddressEqual;
 virDomainDeviceAddressIsValid;
 virDomainDevicePCIAddressIsValid;
 virDomainDeviceInfoIsSet;
-- 
1.6.6

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

Reply via email to