[PATCH 20/33] Don't report OOM error on xmlCopyNode failure

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Out of memory isn't the only reason the function can fail. Add a message
stating that copying of a XML node failed.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/conf/domain_conf.c | 3 ++-
 src/test/test_driver.c | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c0881608af..f1fd5320a5 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -30460,7 +30460,8 @@ virDomainDefSetMetadata(virDomainDefPtr def,
                 def->metadata = virXMLNewNode(NULL, "metadata");

             if (!(new = xmlCopyNode(doc->children, 1))) {
-                virReportOOMError();
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                               _("Failed to copy XML node"));
                 return -1;
             }
         }
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index bca1297d1d..71ab04aa1a 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -224,7 +224,8 @@ testDomainDefNamespaceParse(xmlXPathContextPtr ctxt,
     for (i = 0; i < n; i++) {
         xmlNodePtr newnode = xmlCopyNode(nodes[i], 1);
         if (!newnode) {
-            virReportOOMError();
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("Failed to copy XML node"));
             goto error;
         }

@@ -787,7 +788,8 @@ testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type)

         ret = xmlCopyNode(xmlDocGetRootElement(doc), 1);
         if (!ret) {
-            virReportOOMError();
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("Failed to copy XML node"));
             goto error;
         }
         xmlReplaceNode(node, ret);
-- 
2.29.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux