Use g_auto for stealing virCaps

Convert all the functions that generate virCaps to use g_auto
and g_steal_pointer.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c
index ef6f4b5ba85e29b842cb15b221a74271ea21cb86..a9cbbca56080f79b34fee1b7a57dbf0a9db5c479 100644 (file)
--- a/src/ch/ch_conf.c
+++ b/src/ch/ch_conf.c
@@ -52,7 +52,7 @@ VIR_ONCE_GLOBAL_INIT(virCHConfig);
 /* Functions */
 virCaps *virCHDriverCapsInit(void)
 {
-    virCaps *caps;
+    g_autoptr(virCaps) caps = NULL;
     virCapsGuest *guest;
 
     if ((caps = virCapabilitiesNew(virArchFromHost(),
@@ -70,10 +70,9 @@ virCaps *virCHDriverCapsInit(void)
 
     virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM,
                                   NULL, NULL, 0, NULL);
-    return caps;
+    return g_steal_pointer(&caps);
 
  cleanup:
-    virObjectUnref(caps);
     return NULL;
 }
 

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index bafec27a88cd79ee4dc6346fad1cfac83f55d5f8..4d938f4d7ff2d7afbdca33c56c5027161d595109 100644 (file)
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -262,7 +262,7 @@ hypervLookupHostSystemBiosUuid(hypervPrivate *priv, unsigned char *uuid)
 static virCaps *
 hypervCapsInit(hypervPrivate *priv)
 {
-    virCaps *caps = NULL;
+    g_autoptr(virCaps) caps = NULL;
     virCapsGuest *guest = NULL;
 
     caps = virCapabilitiesNew(VIR_ARCH_X86_64, 1, 1);
@@ -287,10 +287,9 @@ hypervCapsInit(hypervPrivate *priv)
     virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_HYPERV,
                                   NULL, NULL, 0, NULL);
 
-    return caps;
+    return g_steal_pointer(&caps);
 
  error:
-    virObjectUnref(caps);
     return NULL;
 }
 

diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
index 6263b5c8b58f759b7cdba4619d4b1f6f648b13e5..9084dacb4012506cc72853f9840e0ebf88a675d8 100644 (file)
--- a/src/libxl/libxl_capabilities.c
+++ b/src/libxl/libxl_capabilities.c
@@ -635,7 +635,7 @@ libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdev *dev)
 virCaps *
 libxlMakeCapabilities(libxl_ctx *ctx)
 {
-    virCaps *caps;
+    g_autoptr(virCaps) caps = NULL;
 
 #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
     if ((caps = virCapabilitiesNew(virArchFromHost(), false, false)) == NULL)
@@ -653,10 +653,9 @@ libxlMakeCapabilities(libxl_ctx *ctx)
     if (libxlCapsInitGuests(ctx, caps) < 0)
         goto error;
 
-    return caps;
+    return g_steal_pointer(&caps);
 
  error:
-    virObjectUnref(caps);
     return NULL;
 }
 

diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index 73156f15a351da3201276927b3211259c14f9ef5..e9186b879e9465a79c6a81b5fed3baf9a3fb5658 100644 (file)
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -58,7 +58,7 @@ VIR_ONCE_GLOBAL_INIT(virLXCConfig);
 /* Functions */
 virCaps *virLXCDriverCapsInit(virLXCDriver *driver)
 {
-    virCaps *caps;
+    g_autoptr(virCaps) caps = NULL;
     virCapsGuest *guest;
     virArch altArch;
     g_autofree char *lxc_path = NULL;
@@ -138,10 +138,9 @@ virCaps *virLXCDriverCapsInit(virLXCDriver *driver)
         VIR_INFO("No driver, not initializing security driver");
     }
 
-    return caps;
+    return g_steal_pointer(&caps);
 
  error:
-    virObjectUnref(caps);
     return NULL;
 }
 

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 995e63b00472b6c0eb682f64aab917cd8019aeff..020a9e5df0133e90112ad68fdc7725c2b9f1d193 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -291,7 +291,7 @@ static virCaps *
 testBuildCapabilities(virConnectPtr conn)
 {
     testDriver *privconn = conn->privateData;
-    virCaps *caps;
+    g_autoptr(virCaps) caps = NULL;
     virCapsGuest *guest;
     int guest_types[] = { VIR_DOMAIN_OSTYPE_HVM,
                           VIR_DOMAIN_OSTYPE_XEN };
@@ -361,10 +361,9 @@ testBuildCapabilities(virConnectPtr conn)
 
     caps->host.secModels[0].doi = g_strdup("");
 
-    return caps;
+    return g_steal_pointer(&caps);
 
  error:
-    virObjectUnref(caps);
     return NULL;
 }
 

diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 8c8ecc81208ef1de31dee68cdcd7e3af338bb9a1..3f6b51ac44621b9c0699050086ed65af7f006340 100644 (file)
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -64,7 +64,7 @@ vmwareFreeDriver(struct vmware_driver *driver)
 virCaps *
 vmwareCapsInit(void)
 {
-    virCaps *caps = NULL;
+    g_autoptr(virCaps) caps = NULL;
     virCapsGuest *guest = NULL;
 
     if ((caps = virCapabilitiesNew(virArchFromHost(),
@@ -106,11 +106,10 @@ vmwareCapsInit(void)
         guest = NULL;
     }
 
-    return caps;
+    return g_steal_pointer(&caps);
 
  error:
     virCapabilitiesFreeGuest(guest);
-    virObjectUnref(caps);
     return NULL;
 }
 

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 83ff119dd9865e1e1ff64a305e3a73ef1fd08119..1353efa6ab0146cabe4085bbec1a362ddb1027e9 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -94,7 +94,7 @@ vzCapsAddGuestDomain(virCaps *caps,
 static virCaps *
 vzBuildCapabilities(void)
 {
-    virCaps *caps = NULL;
+    g_autoptr(virCaps) caps = NULL;
     virNodeInfo nodeinfo;
     virDomainOSType ostypes[] = {
         VIR_DOMAIN_OSTYPE_HVM,
@@ -137,10 +137,9 @@ vzBuildCapabilities(void)
     if (virCapabilitiesAddHostMigrateTransport(caps, "vzmigr") < 0)
         goto error;
 
-    return caps;
+    return g_steal_pointer(&caps);
 
  error:
-    virObjectUnref(caps);
     return NULL;
 }
 

diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
index 78a2148e1abb2c3197eee6b6d0bbd77e91e17bec..aec4647678754daf6217603328cc97e358f89006 100644 (file)
--- a/tests/qemucaps2xmltest.c
+++ b/tests/qemucaps2xmltest.c
@@ -86,7 +86,7 @@ static virCaps *
 testGetCaps(char *capsData, const testQemuData *data)
 {
     g_autoptr(virQEMUCaps) qemuCaps = NULL;
-    virCaps *caps = NULL;
+    g_autoptr(virCaps) caps = NULL;
     virArch arch = virArchFromString(data->archName);
     g_autofree char *binary = NULL;
 
@@ -110,10 +110,9 @@ testGetCaps(char *capsData, const testQemuData *data)
         goto error;
     }
 
-    return caps;
+    return g_steal_pointer(&caps);
 
  error:
-    virObjectUnref(caps);
     return NULL;
 }
 

diff --git a/tests/testutilsxen.c b/tests/testutilsxen.c
index 1b584e34b1c3a149726c5785d3fc4f2855fd9594..821ee49d94a2e20302e0ec6c905bc13908cccfa2 100644 (file)
--- a/tests/testutilsxen.c
+++ b/tests/testutilsxen.c
@@ -11,7 +11,7 @@
 static virCaps *
 testXLInitCaps(void)
 {
-    virCaps *caps;
+    g_autoptr(virCaps) caps = NULL;
     virCapsGuest *guest;
     virCapsGuestMachine **machines;
     int nmachines;
@@ -68,11 +68,10 @@ testXLInitCaps(void)
 
     virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN,
                                   NULL, NULL, 0, NULL);
-    return caps;
+    return g_steal_pointer(&caps);
 
  cleanup:
     virCapabilitiesFreeMachines(machines, nmachines);
-    virObjectUnref(caps);
     return NULL;
 }