0a7476
From 3e0b4c3b680df486b750174203da60e01198bddf Mon Sep 17 00:00:00 2001
0a7476
Message-Id: <3e0b4c3b680df486b750174203da60e01198bddf@dist-git>
0a7476
From: Jiri Denemark <jdenemar@redhat.com>
0a7476
Date: Thu, 6 Jun 2019 09:29:38 +0200
0a7476
Subject: [PATCH] cpu_conf: Fix XPath for parsing TSC frequency
0a7476
MIME-Version: 1.0
0a7476
Content-Type: text/plain; charset=UTF-8
0a7476
Content-Transfer-Encoding: 8bit
0a7476
0a7476
Due to this bug the following command would fail on any host where TSC
0a7476
frequency can be probed:
0a7476
0a7476
    $ virsh capabilities | virsh cpu-baseline /dev/stdin
0a7476
    error: unsupported configuration: Invalid TSC frequency
0a7476
0a7476
https://bugzilla.redhat.com/show_bug.cgi?id=1641702
0a7476
0a7476
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
0a7476
Reviewed-by: Ján Tomko <jtomko@redhat.com>
0a7476
(cherry picked from commit 4d21d4acf2eac961b8c25f1ec49a9c25f3951fdb)
0a7476
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
0a7476
Reviewed-by: Ján Tomko <jtomko@redhat.com>
0a7476
---
0a7476
 src/conf/cpu_conf.c | 4 ++--
0a7476
 1 file changed, 2 insertions(+), 2 deletions(-)
0a7476
0a7476
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
0a7476
index d0ad265fbe..7a5e642541 100644
0a7476
--- a/src/conf/cpu_conf.c
0a7476
+++ b/src/conf/cpu_conf.c
0a7476
@@ -407,8 +407,8 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
0a7476
             if (VIR_ALLOC(tsc) < 0)
0a7476
                 goto cleanup;
0a7476
 
0a7476
-            if (virXPathULongLong("./counter[@name='tsc']/@frequency", ctxt,
0a7476
-                                  &tsc->frequency) < 0) {
0a7476
+            if (virXPathULongLong("string(./counter[@name='tsc']/@frequency)",
0a7476
+                                  ctxt, &tsc->frequency) < 0) {
0a7476
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
0a7476
                                _("Invalid TSC frequency"));
0a7476
                 goto cleanup;
0a7476
-- 
0a7476
2.21.0
0a7476