Pass config file object through to driver open methods

The virConnectOpenInternal method opens the libvirt client
config file and uses it to resolve things like URI aliases.

There may be driver specific things that are useful to
store in the config file too, so rather than have them
re-parse the same file, pass the virConfPtr down to the
drivers.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index c15725f211311834fda3aa8c80ba7f1857609339..a629038b466665fc6b3717c2c92fb03054e1959b 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -178,6 +178,7 @@ bhyveDomObjFromDomain(virDomainPtr domain)
 static virDrvOpenStatus
 bhyveConnectOpen(virConnectPtr conn,
                  virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+                 virConfPtr conf ATTRIBUTE_UNUSED,
                  unsigned int flags)
 {
      virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);

diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h
index d11ff7faefc3659157200dbe83e5af5e82f82b9f..5ab5775b65a3564e3a77d98c60f739ac65d55653 100644 (file)
--- a/src/driver-hypervisor.h
+++ b/src/driver-hypervisor.h
@@ -28,6 +28,7 @@
 typedef virDrvOpenStatus
 (*virDrvConnectOpen)(virConnectPtr conn,
                      virConnectAuthPtr auth,
+                     virConfPtr conf,
                      unsigned int flags);
 
 typedef int

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 44cdf71b32a07f274634ad75197601098ac62903..60fcac064023495f71fd8ed09ebd61fd273861ff 100644 (file)
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -841,6 +841,7 @@ esxConnectToVCenter(esxPrivate *priv,
  */
 static virDrvOpenStatus
 esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
+               virConfPtr conf ATTRIBUTE_UNUSED,
                unsigned int flags)
 {
     virDrvOpenStatus result = VIR_DRV_OPEN_ERROR;

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index b95c5491d34c0b2c6fc37d566700eb33ea65b71e..9c7faf055b6f7b1ef4d6fa735065fe6d850b70c9 100644 (file)
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -58,7 +58,9 @@ hypervFreePrivate(hypervPrivate **priv)
 
 
 static virDrvOpenStatus
-hypervConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags)
+hypervConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
+                  virConfPtr conf ATTRIBUTE_UNUSED,
+                  unsigned int flags)
 {
     virDrvOpenStatus result = VIR_DRV_OPEN_ERROR;
     char *plus;

diff --git a/src/libvirt.c b/src/libvirt.c
index 6d9dba8887169f99c0394168c33a5d71110b9f5a..a5e0e4148b4ae575b95c9b2e0bf3f2adf9385f19 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1084,7 +1084,7 @@ virConnectOpenInternal(const char *name,
         ret->secretDriver = virConnectDriverTab[i]->secretDriver;
         ret->storageDriver = virConnectDriverTab[i]->storageDriver;
 
-        res = virConnectDriverTab[i]->hypervisorDriver->connectOpen(ret, auth, flags);
+        res = virConnectDriverTab[i]->hypervisorDriver->connectOpen(ret, auth, conf, flags);
         VIR_DEBUG("driver %zu %s returned %s",
                   i, virConnectDriverTab[i]->hypervisorDriver->name,
                   res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" :

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index bbcf8b9fce0f36dd9cec03f9ce244ad797c72881..2ab08ac76c376fdae9fe97936662bca61cbf4ba0 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -763,6 +763,7 @@ libxlStateReload(void)
 static virDrvOpenStatus
 libxlConnectOpen(virConnectPtr conn,
                  virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+                 virConfPtr conf ATTRIBUTE_UNUSED,
                  unsigned int flags)
 {
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 9266349a71fa4fc313e2e8e4145c9469b5989af7..2692d8165d5b75aed258cad853dcd6f3754cbc76 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -155,6 +155,7 @@ lxcDomObjFromDomain(virDomainPtr domain)
 
 static virDrvOpenStatus lxcConnectOpen(virConnectPtr conn,
                                        virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+                                       virConfPtr conf ATTRIBUTE_UNUSED,
                                        unsigned int flags)
 {
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index aa482c9cd0361a0310502e1e4c3d3f3096685b73..823e0c2356169581fc02d079b9387aadcbc57998 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -1423,6 +1423,7 @@ openvzDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus)
 
 static virDrvOpenStatus openvzConnectOpen(virConnectPtr conn,
                                           virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+                                          virConfPtr conf ATTRIBUTE_UNUSED,
                                           unsigned int flags)
 {
     struct openvz_driver *driver;

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index cad51e7585206cecf31a593de7f2859924e66641..0521540b0aec7b4a40aa8ec216fa9d3ba5c58d6d 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -1123,7 +1123,9 @@ virDomainDefParserConfig virPhypDriverDomainDefParserConfig = {
 
 static virDrvOpenStatus
 phypConnectOpen(virConnectPtr conn,
-                virConnectAuthPtr auth, unsigned int flags)
+                virConnectAuthPtr auth,
+                virConfPtr conf ATTRIBUTE_UNUSED,
+                unsigned int flags)
 {
     LIBSSH2_SESSION *session = NULL;
     int internal_socket = -1;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index fc43bcb239d480d5865e9161698ed8c2bb15cb2c..8b3f5381fbaf9f3b2ff0f61bc6b86265d13235d8 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1132,6 +1132,7 @@ qemuStateCleanup(void)
 
 static virDrvOpenStatus qemuConnectOpen(virConnectPtr conn,
                                         virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+                                        virConfPtr conf ATTRIBUTE_UNUSED,
                                         unsigned int flags)
 {
     virQEMUDriverConfigPtr cfg = NULL;

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 4e44e2ad9954a66b9cc3d5d43e81c31973b98dce..6094afe6226386fb802839e60a25b42f397563be 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1180,6 +1180,7 @@ remoteAllocPrivateData(void)
 static virDrvOpenStatus
 remoteConnectOpen(virConnectPtr conn,
                   virConnectAuthPtr auth,
+                  virConfPtr conf ATTRIBUTE_UNUSED,
                   unsigned int flags)
 {
     struct private_data *priv;

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 5bb97adef869e5a7d5ba12c46acde5f01e52aa29..6ab939a22c7632f530e8eab14dcf00d06ddb0f18 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1411,6 +1411,7 @@ testConnectAuthenticate(virConnectPtr conn,
 
 static virDrvOpenStatus testConnectOpen(virConnectPtr conn,
                                         virConnectAuthPtr auth,
+                                        virConfPtr conf ATTRIBUTE_UNUSED,
                                         unsigned int flags)
 {
     int ret;

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 5e7e09d95d2e96941e585101f32b07d960eef338..20eef317ef14f8c3f106e7e84199ffea9c089d29 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -1195,6 +1195,7 @@ static void umlShutdownVMDaemon(struct uml_driver *driver,
 
 static virDrvOpenStatus umlConnectOpen(virConnectPtr conn,
                                        virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+                                       virConfPtr conf ATTRIBUTE_UNUSED,
                                        unsigned int flags)
 {
     virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index ad5cbe9460f306b2398e127b41a8819ce9a6b6e3..921eb8604994bf08a0c05fed365b1299180dc988 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -391,6 +391,7 @@ static void vboxUninitialize(vboxGlobalData *data)
 static virDrvOpenStatus
 vboxConnectOpen(virConnectPtr conn,
                 virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+                virConfPtr conf ATTRIBUTE_UNUSED,
                 unsigned int flags)
 {
     vboxGlobalData *data = NULL;

diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index d363fef5907d818d882daca911d1713849ec27b1..a5f3721682cb2d3ee2c30f51e7cb545b05d9bcd7 100644 (file)
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -53,6 +53,7 @@ VIR_LOG_INIT("vbox.vbox_driver");
 #if !defined(WITH_DRIVER_MODULES) || defined(VBOX_DRIVER)
 static virDrvOpenStatus dummyConnectOpen(virConnectPtr conn,
                                          virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+                                         virConfPtr conf ATTRIBUTE_UNUSED,
                                          unsigned int flags)
 {
     uid_t uid = geteuid();

diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 4ac279991d4c4428f29d88a531892c913e0e932c..efdf7dcdac7e925480a2780ed38d79854f00e35b 100644 (file)
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -118,6 +118,7 @@ vmwareDomainXMLConfigInit(void)
 static virDrvOpenStatus
 vmwareConnectOpen(virConnectPtr conn,
                   virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+                  virConfPtr conf ATTRIBUTE_UNUSED,
                   unsigned int flags)
 {
     struct vmware_driver *driver;

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index e59cf30c2628f05cad62de73c0a30d6603dfc5e4..26d4bf095f0d99ad02af1120bd7770fc8004166a 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -333,6 +333,7 @@ vzDriverObjNew(void)
 static virDrvOpenStatus
 vzConnectOpen(virConnectPtr conn,
               virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+              virConfPtr conf ATTRIBUTE_UNUSED,
               unsigned int flags)
 {
     vzDriverPtr driver = NULL;

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 8806081865614b205e5e65da4dd4862f2e34e177..130f7f6cffd0f840adf72d49fb43d9a4a8e27130 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -404,7 +404,9 @@ xenDomainXMLConfInit(void)
 
 
 static virDrvOpenStatus
-xenUnifiedConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags)
+xenUnifiedConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
+                      virConfPtr conf ATTRIBUTE_UNUSED,
+                      unsigned int flags)
 {
     xenUnifiedPrivatePtr priv;
 

diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 070e8d2fd3d2a0a9ccb14512ff332fe9cceaef8d..676ed5b982588b9a51d5ed98f26b1cd00e35844c 100644 (file)
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -135,6 +135,7 @@ getCapsObject(void)
  */
 static virDrvOpenStatus
 xenapiConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
+                  virConfPtr conf ATTRIBUTE_UNUSED,
                   unsigned int flags)
 {
     char *username = NULL;