Report errors in virCapabilitiesFormatXML

So far, we only report an error if formatting the siblings bitmap
in NUMA topology fails.

Be consistent and always report error in virCapabilitiesFormatXML.

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index eb5fc9590d9d246593169aa28147530c45605f87..6c0c8b1ba3de13812e6dc2c9cb27e21dab494a61 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -150,10 +150,8 @@ bhyveConnectGetCapabilities(virConnectPtr conn)
         goto cleanup;
     }
 
-    if (!(xml = virCapabilitiesFormatXML(caps))) {
-        virReportOOMError();
+    if (!(xml = virCapabilitiesFormatXML(caps)))
         goto cleanup;
-    }
 
  cleanup:
     virObjectUnref(caps);

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 19359a57c6d1259052fd0b028f0e33fdfc8aff96..8504d3442a89bf53a9b41e00fa98abfd4617c5d4 100644 (file)
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -1025,10 +1025,8 @@ virCapabilitiesFormatXML(virCapsPtr caps)
     virBufferAdjustIndent(&buf, -2);
     virBufferAddLit(&buf, "</capabilities>\n");
 
-    if (virBufferError(&buf)) {
-        virBufferFreeAndReset(&buf);
+    if (virBufferCheckError(&buf) < 0)
         return NULL;
-    }
 
     return virBufferContentAndReset(&buf);
 }

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 5dd0a63f1d4e0dc3fe8166fb3da245f0cdd0ab3b..48e0cd9b53709c82f7fdd88c854f87e52dcdd97b 100644 (file)
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -1420,14 +1420,8 @@ static char *
 esxConnectGetCapabilities(virConnectPtr conn)
 {
     esxPrivate *priv = conn->privateData;
-    char *xml = virCapabilitiesFormatXML(priv->caps);
 
-    if (!xml) {
-        virReportOOMError();
-        return NULL;
-    }
-
-    return xml;
+    return virCapabilitiesFormatXML(priv->caps);
 }
 
 

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 646c9b9dcccee1015ae158f77c57b8c2cdd6b4cb..08faa1928c206a92120372a6ebaebb58990af448 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -594,8 +594,7 @@ libxlConnectGetCapabilities(virConnectPtr conn)
         return NULL;
 
     cfg = libxlDriverConfigGet(driver);
-    if ((xml = virCapabilitiesFormatXML(cfg->caps)) == NULL)
-        virReportOOMError();
+    xml = virCapabilitiesFormatXML(cfg->caps);
 
     virObjectUnref(cfg);
     return xml;

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index a9a87eab8e87e73732507adbe8042359917096af..24255fc585e4e2f6543ea33714461d2524420b9c 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -232,8 +232,7 @@ static char *lxcConnectGetCapabilities(virConnectPtr conn) {
     if (!(caps = virLXCDriverGetCapabilities(driver, false)))
         return NULL;
 
-    if ((xml = virCapabilitiesFormatXML(caps)) == NULL)
-        virReportOOMError();
+    xml = virCapabilitiesFormatXML(caps);
 
     virObjectUnref(caps);
     return xml;

diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index 411527c03fbcb1322eb2bb2f53ce612b6a13afbd..b388e2d77ce7aa1c351bc66bf6f7f40b5f2f0b76 100644 (file)
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -186,8 +186,7 @@ parallelsConnectGetCapabilities(virConnectPtr conn)
     char *xml;
 
     parallelsDriverLock(privconn);
-    if ((xml = virCapabilitiesFormatXML(privconn->caps)) == NULL)
-        virReportOOMError();
+    xml = virCapabilitiesFormatXML(privconn->caps);
     parallelsDriverUnlock(privconn);
     return xml;
 }

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 508e4c0d8cb01305ed02a12bef3a647c5a6c69c4..659f8db3f4ef36f749dea1ba70a54072d027d9ba 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -3582,12 +3582,8 @@ static char *
 phypConnectGetCapabilities(virConnectPtr conn)
 {
     phyp_driverPtr phyp_driver = conn->privateData;
-    char *xml;
 
-    if ((xml = virCapabilitiesFormatXML(phyp_driver->caps)) == NULL)
-        virReportOOMError();
-
-    return xml;
+    return virCapabilitiesFormatXML(phyp_driver->caps);
 }
 
 static int

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d45a16107aba8b5f3409367f9e417fc10a32307e..fd91d15ec732d32d1efca3fd6d1b43da3e95b32e 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1245,8 +1245,7 @@ static char *qemuConnectGetCapabilities(virConnectPtr conn) {
     if (!(caps = virQEMUDriverGetCapabilities(driver, true)))
         goto cleanup;
 
-    if ((xml = virCapabilitiesFormatXML(caps)) == NULL)
-        virReportOOMError();
+    xml = virCapabilitiesFormatXML(caps);
     virObjectUnref(caps);
 
  cleanup:

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 0bf710a1abe6af16b283c0b5236729cf58979aa6..7bfc88d981b745c55118c33912f691753b94ea77 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1677,8 +1677,7 @@ static char *testConnectGetCapabilities(virConnectPtr conn)
     testConnPtr privconn = conn->privateData;
     char *xml;
     testDriverLock(privconn);
-    if ((xml = virCapabilitiesFormatXML(privconn->caps)) == NULL)
-        virReportOOMError();
+    xml = virCapabilitiesFormatXML(privconn->caps);
     testDriverUnlock(privconn);
     return xml;
 }

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index f14cfaa0aa7609f288f96ea33d73e4950798d240..62d1afe2e27ff16fcddeccc94689b4dc25862ed5 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -1310,8 +1310,7 @@ static char *umlConnectGetCapabilities(virConnectPtr conn) {
         return NULL;
 
     umlDriverLock(driver);
-    if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
-        virReportOOMError();
+    xml = virCapabilitiesFormatXML(driver->caps);
     umlDriverUnlock(driver);
 
     return xml;

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 8c0050acb2d3692c5a88ec0aa1b54f03ca5c0b60..9355a4e185b59dc0a0953bbda9b23076d1205bdb 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -720,17 +720,11 @@ static char *
 xenUnifiedConnectGetCapabilities(virConnectPtr conn)
 {
     xenUnifiedPrivatePtr priv = conn->privateData;
-    char *xml;
 
     if (virConnectGetCapabilitiesEnsureACL(conn) < 0)
         return NULL;
 
-    if (!(xml = virCapabilitiesFormatXML(priv->caps))) {
-        virReportOOMError();
-        return NULL;
-    }
-
-    return xml;
+    return virCapabilitiesFormatXML(priv->caps);
 }
 
 static int

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 2e35edfa61a640ace5d65cd9db86a1210ccbb125..524b21f34a9a560f59996d6a0092c48b649365ef 100644 (file)
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2557,14 +2557,8 @@ char *
 xenHypervisorGetCapabilities(virConnectPtr conn)
 {
     xenUnifiedPrivatePtr priv = conn->privateData;
-    char *xml;
 
-    if (!(xml = virCapabilitiesFormatXML(priv->caps))) {
-        virReportOOMError();
-        return NULL;
-    }
-
-    return xml;
+    return virCapabilitiesFormatXML(priv->caps);
 }
 
 

diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 500b78a1a8c8017853b6ca599173960b8e9f90fc..e3bb77e3988c5160df73d75d76cde2c67fb3dd28 100644 (file)
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -445,12 +445,8 @@ xenapiConnectGetCapabilities(virConnectPtr conn)
 {
 
     virCapsPtr caps = ((struct _xenapiPrivate *)(conn->privateData))->caps;
-    if (caps) {
-        char *xml = virCapabilitiesFormatXML(caps);
-        if (!xml)
-            goto cleanup;
-        return xml;
-    }
+    if (caps)
+        return virCapabilitiesFormatXML(caps);
  cleanup:
     xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
                               _("Capabilities not available"));

diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index 7166c98e69c27b4798667ff23ab5304332912604..d8b61aa972c35d3f0ebcd1860248a2873136eb7f 100644 (file)
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -114,10 +114,8 @@ test_virCapabilitiesFormat(const void *opaque)
                                       data->max_mem_in_cell)))
         goto cleanup;
 
-    if (!(capsXML = virCapabilitiesFormatXML(caps))) {
-        fprintf(stderr, "Unable to format capabilities XML");
+    if (!(capsXML = virCapabilitiesFormatXML(caps)))
         goto cleanup;
-    }
 
     if (virAsprintf(&path, "%s/vircaps2xmldata/vircaps-%s.xml",
                     abs_srcdir, data->filename) < 0)