From 33be48d78edc85d9162e56824cf9b45f51b68152 Mon Sep 17 00:00:00 2001 From: Jim Fehlig Date: Wed, 24 Jun 2015 16:15:22 -0600 Subject: [PATCH] libxl: honor domainGetXMLDesc() --inactive flag The libxl driver always uses virDomainObj->def when formatting the domain XML description. Use virDomainObj->newDef when --inactive flag is set. Signed-off-by: Jim Fehlig --- src/libxl/libxl_driver.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index b1b0e554d2..bf871de23f 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2429,6 +2429,7 @@ static char * libxlDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { virDomainObjPtr vm; + virDomainDefPtr def; char *ret = NULL; /* Flags checked by virDomainDefFormat */ @@ -2439,8 +2440,13 @@ libxlDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) if (virDomainGetXMLDescEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - ret = virDomainDefFormat(vm->def, - virDomainDefFormatConvertXMLFlags(flags)); + if ((flags & VIR_DOMAIN_XML_INACTIVE) && vm->newDef) + def = vm->newDef; + else + def = vm->def; + + ret = virDomainDefFormat(def, + virDomainDefFormatConvertXMLFlags(flags)); cleanup: if (vm) -- GitLab