53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
From 21dece5adb14014a8f8e6cc1c1b82fd98082fe75 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <21dece5adb14014a8f8e6cc1c1b82fd98082fe75.1763133105.git.jdenemar@redhat.com>
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
|
Date: Thu, 2 Oct 2025 09:38:04 +0200
|
|
Subject: [PATCH] qemu: Use virXPathTristateBool()
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
There are two places in our code base which can use freshly
|
|
introduced virXPathTristateBool():
|
|
qemuStorageSourcePrivateDataParse() and
|
|
qemuDomainObjPrivateXMLParseBlockjobs().
|
|
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
(cherry picked from commit 5369f071e40cb91a8b7ee79efda078eca7b15035)
|
|
Resolves: https://issues.redhat.com/browse/RHEL-122930
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
---
|
|
src/qemu/qemu_domain.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
|
index 8879a45ffb..56d8bb4827 100644
|
|
--- a/src/qemu/qemu_domain.c
|
|
+++ b/src/qemu/qemu_domain.c
|
|
@@ -2072,7 +2072,7 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr ctxt,
|
|
g_autofree char *authalias = NULL;
|
|
g_autofree char *httpcookiealias = NULL;
|
|
g_autofree char *tlskeyalias = NULL;
|
|
- g_autofree char *thresholdEventWithIndex = NULL;
|
|
+ virTristateBool thresholdEventWithIndex;
|
|
bool fdsetPresent = false;
|
|
unsigned int fdSetID;
|
|
int enccount;
|
|
@@ -2138,9 +2138,10 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr ctxt,
|
|
if (virStorageSourcePrivateDataParseRelPath(ctxt, src) < 0)
|
|
return -1;
|
|
|
|
- if ((thresholdEventWithIndex = virXPathString("string(./thresholdEvent/@indexUsed)", ctxt)) &&
|
|
- virTristateBoolTypeFromString(thresholdEventWithIndex) == VIR_TRISTATE_BOOL_YES)
|
|
- src->thresholdEventWithIndex = true;
|
|
+ if (virXPathTristateBool("string(./thresholdEvent/@indexUsed)",
|
|
+ ctxt, &thresholdEventWithIndex) >= 0) {
|
|
+ virTristateBoolToBool(thresholdEventWithIndex, &src->thresholdEventWithIndex);
|
|
+ }
|
|
|
|
if ((nbdkitnode = virXPathNode("nbdkit", ctxt))) {
|
|
if (qemuStorageSourcePrivateDataParseNbdkit(nbdkitnode, ctxt, src) < 0)
|
|
--
|
|
2.51.1
|