From 09ebe533494de8e2373d97f8849e404aa127241d Mon Sep 17 00:00:00 2001
From: Jakub Palacky <jpalacky@redhat.com>
Date: Thu, 12 Sep 2024 13:47:21 +0200
Subject: [PATCH] util/virxml: use xmlCtxtGetLastError when applicable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

xmlParserCtxt->lastError was deprecated in libxml2 v2.13.0-103-g1228b4e0
xmlCtxtGetLastError(xmlParserCtxt) should be used instead

Signed-off-by: Jakub Palacky <jpalacky@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/util/virxml.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/util/virxml.c b/src/util/virxml.c
index a7b75fd7b3..51173303fe 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -1029,14 +1029,15 @@ catchXMLError(void *ctx, const char *msg G_GNUC_UNUSED, ...)
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     g_autofree char *contextstr = NULL;
     g_autofree char *pointerstr = NULL;
-
+    const xmlError *lastError = xmlCtxtGetLastError(ctxt);
 
     /* conditions for error printing */
     if (!ctxt ||
         (virGetLastErrorCode()) ||
         ctxt->input == NULL ||
-        ctxt->lastError.level != XML_ERR_FATAL ||
-        ctxt->lastError.message == NULL)
+        lastError == NULL ||
+        lastError->level != XML_ERR_FATAL ||
+        lastError->message == NULL)
         return;
 
     if (ctxt->_private)
@@ -1078,19 +1079,19 @@ catchXMLError(void *ctx, const char *msg G_GNUC_UNUSED, ...)
 
     pointerstr = virBufferContentAndReset(&buf);
 
-    if (ctxt->lastError.file) {
+    if (lastError->file) {
         virGenericReportError(domcode, VIR_ERR_XML_DETAIL,
                               _("%1$s:%2$d: %3$s%4$s\n%5$s"),
-                              ctxt->lastError.file,
-                              ctxt->lastError.line,
-                              ctxt->lastError.message,
+                              lastError->file,
+                              lastError->line,
+                              lastError->message,
                               contextstr,
                               pointerstr);
     } else {
         virGenericReportError(domcode, VIR_ERR_XML_DETAIL,
                               _("at line %1$d: %2$s%3$s\n%4$s"),
-                              ctxt->lastError.line,
-                              ctxt->lastError.message,
+                              lastError->line,
+                              lastError->message,
                               contextstr,
                               pointerstr);
     }