[libvirt] [PATCH 1/2] qemu: Parse all job related private XML in dedicated function
Commit dc567cc22b introduced qemuDomainObjPrivateXMLParseJob, but forgot
to move "./job[1]/@type" parsing into it.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/qemu/qemu_domain.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 2d108bec1b..a08a1825e9 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2337,6 +2337,18 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm,
int n;
int ret = -1;
+ if ((tmp = virXPathString("string(./job[1]/@type)", ctxt))) {
+ int type;
+
+ if ((type = qemuDomainJobTypeFromString(tmp)) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Unknown job type %s"), tmp);
+ goto cleanup;
+ }
+ VIR_FREE(tmp);
+ priv->job.active = type;
+ }
+
if ((tmp = virXPathString("string(./job[1]/@async)", ctxt))) {
int async;
@@ -2502,19 +2514,6 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
priv->lockState = virXPathString("string(./lockstate)", ctxt);
- if ((tmp = virXPathString("string(./job[1]/@type)", ctxt))) {
- int type;
-
- if ((type = qemuDomainJobTypeFromString(tmp)) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Unknown job type %s"), tmp);
- VIR_FREE(tmp);
- goto error;
- }
- VIR_FREE(tmp);
- priv->job.active = type;
- }
-
if (qemuDomainObjPrivateXMLParseJob(vm, priv, ctxt) < 0)
goto error;
--
2.16.2