[libvirt] [PATCH v2 05/12] Factor out conn
Signed-off-by: Ryan Moeller <ryan(a)iXsystems.com>
---
src/bhyve/bhyve_driver.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index d591ff63e3..a862921c87 100644
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -947,7 +947,8 @@ bhyveDomainCreateXML(virConnectPtr conn,
static int
bhyveDomainDestroyFlags(virDomainPtr dom, unsigned int flags)
{
- bhyveConnPtr privconn = dom->conn->privateData;
+ virConnectPtr conn = dom->conn;
+ bhyveConnPtr privconn = conn->privateData;
virDomainObjPtr vm;
virObjectEventPtr event = NULL;
int ret = -1;
@@ -957,7 +958,7 @@ bhyveDomainDestroyFlags(virDomainPtr dom, unsigned int flags)
if (!(vm = bhyveDomObjFromDomain(dom)))
goto cleanup;
- if (virDomainDestroyFlagsEnsureACL(dom->conn, vm->def) < 0)
+ if (virDomainDestroyFlagsEnsureACL(conn, vm->def) < 0)
goto cleanup;
if (virDomainObjCheckActive(vm) < 0)
@@ -1061,7 +1062,8 @@ bhyveDomainSetMetadata(virDomainPtr dom,
const char *uri,
unsigned int flags)
{
- bhyveConnPtr privconn = dom->conn->privateData;
+ virConnectPtr conn = dom->conn;
+ bhyveConnPtr privconn = conn->privateData;
virDomainObjPtr vm;
int ret = -1;
@@ -1071,7 +1073,7 @@ bhyveDomainSetMetadata(virDomainPtr dom,
if (!(vm = bhyveDomObjFromDomain(dom)))
return -1;
- if (virDomainSetMetadataEnsureACL(dom->conn, vm->def, flags) < 0)
+ if (virDomainSetMetadataEnsureACL(conn, vm->def, flags) < 0)
goto cleanup;
ret = virDomainObjSetMetadata(vm, type, metadata, key, uri,
--
2.23.0