Re: [libvirt] [dbus RFC 03/11] src: rename manager to connect

[Daniel P. Berrange]

On Mon, Jan 22, 2018 at 06:16:01PM +0100, Pavel Hrdina wrote:
> Manager was a good name for the original design.  However, the design
> will be changed that for now libvirt-dbus will be using only local
> connection and will support multiple drivers.
> 
> Signed-off-by: Pavel Hrdina 
> ---
>  src/Makefile.am   |  2 +-
>  src/{manager.c => connect.c}  | 93 
> ---
>  src/{manager.h => connect.h}  | 10 ++--
>  src/domain.c  | 80 +-
>  src/domain.h  |  4 +-
>  src/events.c  | 54 +-
>  src/events.h  |  4 +-
>  src/main.c|  8 +--
>  test/Makefile.am  |  2 +-
>  test/libvirttest.py   |  4 +-
>  test/{test_manager.py => test_connect.py} | 12 ++--
>  test/test_domain.py   |  6 +-
>  12 files changed, 140 insertions(+), 139 deletions(-)
>  rename src/{manager.c => connect.c} (64%)
>  rename src/{manager.h => connect.h} (53%)
>  rename test/{test_manager.py => test_connect.py} (79%)


Reviewed-by: Daniel P. Berrange 


Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|

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

[libvirt] [dbus RFC 03/11] src: rename manager to connect

[Pavel Hrdina]

Manager was a good name for the original design.  However, the design
will be changed that for now libvirt-dbus will be using only local
connection and will support multiple drivers.

Signed-off-by: Pavel Hrdina 
---
 src/Makefile.am   |  2 +-
 src/{manager.c => connect.c}  | 93 ---
 src/{manager.h => connect.h}  | 10 ++--
 src/domain.c  | 80 +-
 src/domain.h  |  4 +-
 src/events.c  | 54 +-
 src/events.h  |  4 +-
 src/main.c|  8 +--
 test/Makefile.am  |  2 +-
 test/libvirttest.py   |  4 +-
 test/{test_manager.py => test_connect.py} | 12 ++--
 test/test_domain.py   |  6 +-
 12 files changed, 140 insertions(+), 139 deletions(-)
 rename src/{manager.c => connect.c} (64%)
 rename src/{manager.h => connect.h} (53%)
 rename test/{test_manager.py => test_connect.py} (79%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 5d4cb04..1a5b50b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = \
 
 DAEMON_SOURCES = \
main.c \
-   manager.c manager.h \
+   connect.c connect.h \
util.c util.h \
domain.c domain.h \
events.c events.h
diff --git a/src/manager.c b/src/connect.c
similarity index 64%
rename from src/manager.c
rename to src/connect.c
index f289a7a..cb19c39 100644
--- a/src/manager.c
+++ b/src/connect.c
@@ -1,24 +1,24 @@
 #include "domain.h"
 #include "events.h"
-#include "manager.h"
+#include "connect.h"
 #include "util.h"
 
 #include 
 #include 
 
 static int
-virtDBusManagerEnumarateDomains(sd_bus *bus VIR_ATTR_UNUSED,
+virtDBusConnectEnumarateDomains(sd_bus *bus VIR_ATTR_UNUSED,
 const char *path VIR_ATTR_UNUSED,
 void *userdata,
 char ***nodes,
 sd_bus_error *error)
 {
-virtDBusManager *manager = userdata;
+virtDBusConnect *connect = userdata;
 _cleanup_(virtDBusUtilVirDomainListFreep) virDomainPtr *domains = NULL;
 _cleanup_(virtDBusUtilStrvFreep) char **paths = NULL;
 int n_domains;
 
-n_domains = virConnectListAllDomains(manager->connection, , 0);
+n_domains = virConnectListAllDomains(connect->connection, , 0);
 if (n_domains < 0)
 return virtDBusUtilSetLastVirtError(error);
 
@@ -34,11 +34,11 @@ virtDBusManagerEnumarateDomains(sd_bus *bus VIR_ATTR_UNUSED,
 }
 
 static int
-virtDBusManagerListDomains(sd_bus_message *message,
+virtDBusConnectListDomains(sd_bus_message *message,
void *userdata,
sd_bus_error *error)
 {
-virtDBusManager *manager = userdata;
+virtDBusConnect *connect = userdata;
 _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
 _cleanup_(virtDBusUtilVirDomainListFreep) virDomainPtr *domains = NULL;
 uint32_t flags;
@@ -48,7 +48,7 @@ virtDBusManagerListDomains(sd_bus_message *message,
 if (r < 0)
 return r;
 
-r = virConnectListAllDomains(manager->connection, , flags);
+r = virConnectListAllDomains(connect->connection, , flags);
 if (r < 0)
 return virtDBusUtilSetLastVirtError(error);
 
@@ -78,11 +78,11 @@ virtDBusManagerListDomains(sd_bus_message *message,
 }
 
 static int
-virtDBusManagerCreateXML(sd_bus_message *message,
+virtDBusConnectCreateXML(sd_bus_message *message,
  void *userdata,
  sd_bus_error *error)
 {
-virtDBusManager *manager = userdata;
+virtDBusConnect *connect = userdata;
 const char *xml;
 uint32_t flags;
 _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain = NULL;
@@ -93,7 +93,7 @@ virtDBusManagerCreateXML(sd_bus_message *message,
 if (r < 0)
 return r;
 
-domain = virDomainCreateXML(manager->connection, xml, flags);
+domain = virDomainCreateXML(connect->connection, xml, flags);
 if (!domain)
 return virtDBusUtilSetLastVirtError(error);
 
@@ -103,11 +103,11 @@ virtDBusManagerCreateXML(sd_bus_message *message,
 }
 
 static int
-virtDBusManagerDefineXML(sd_bus_message *message,
+virtDBusConnectDefineXML(sd_bus_message *message,
  void *userdata,
  sd_bus_error *error)
 {
-virtDBusManager *manager = userdata;
+virtDBusConnect *connect = userdata;
 const char *xml;
 _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain = NULL;
 _cleanup_(virtDBusUtilFreep) char *path = NULL;
@@ -117,7 +117,7 @@ virtDBusManagerDefineXML(sd_bus_message *message,
 if (r < 0)
 return r;
 
-domain = virDomainDefineXML(manager->connection, xml);
+domain = virDomainDefineXML(connect->connection, xml);
 if