conf: drop virCapsPtr param from domain formatting APIs

This parameter is now unused and can be removed entirely.
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>

src/bhyve/bhyve_driver.c

@@ -480,7 +480,6 @@ bhyveDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
 {
     bhyveConnPtr privconn = domain->conn->privateData;
     virDomainObjPtr vm;
-    virCapsPtr caps = NULL;
     char *ret = NULL;
 
     virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS, NULL);
@@ -491,14 +490,9 @@ bhyveDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
     if (virDomainGetXMLDescEnsureACL(domain->conn, vm->def, flags) < 0)
         goto cleanup;
 
-    caps = bhyveDriverGetCapabilities(privconn);
-    if (!caps)
-        goto cleanup;
-
-    ret = virDomainDefFormat(vm->def, privconn->xmlopt, caps,
+    ret = virDomainDefFormat(vm->def, privconn->xmlopt,
                              virDomainDefFormatConvertXMLFlags(flags));
 
-    virObjectUnref(caps);
  cleanup:
     virDomainObjEndAPI(&vm);
     return ret;
@@ -1561,7 +1555,6 @@ bhyveConnectDomainXMLFromNative(virConnectPtr conn,
     char *xml = NULL;
     virDomainDefPtr def = NULL;
     bhyveConnPtr privconn = conn->privateData;
-    virCapsPtr capabilities = NULL;
     unsigned caps = bhyveDriverGetCaps(conn);
 
     virCheckFlags(0, NULL);
@@ -1569,10 +1562,6 @@ bhyveConnectDomainXMLFromNative(virConnectPtr conn,
     if (virConnectDomainXMLFromNativeEnsureACL(conn) < 0)
         return NULL;
 
-    capabilities = bhyveDriverGetCapabilities(privconn);
-    if (!capabilities)
-        return NULL;
-
     if (STRNEQ(nativeFormat, BHYVE_CONFIG_FORMAT_ARGV)) {
         virReportError(VIR_ERR_INVALID_ARG,
                        _("unsupported config type %s"), nativeFormat);
@@ -1583,10 +1572,9 @@ bhyveConnectDomainXMLFromNative(virConnectPtr conn,
     if (def == NULL)
         goto cleanup;
 
-    xml = virDomainDefFormat(def, privconn->xmlopt, capabilities, 0);
+    xml = virDomainDefFormat(def, privconn->xmlopt, 0);
 
  cleanup:
-    virObjectUnref(capabilities);
     virDomainDefFree(def);
     return xml;
 }

src/conf/checkpoint_conf.c

@@ -446,7 +446,7 @@ virDomainCheckpointDiskDefFormat(virBufferPtr buf,
 static int
 virDomainCheckpointDefFormatInternal(virBufferPtr buf,
                                      virDomainCheckpointDefPtr def,
-                                     virCapsPtr caps,
+                                     virCapsPtr caps G_GNUC_UNUSED,
                                      virDomainXMLOptionPtr xmlopt,
                                      unsigned int flags)
 {
@@ -490,7 +490,7 @@ virDomainCheckpointDefFormatInternal(virBufferPtr buf,
 
     if (!(flags & VIR_DOMAIN_CHECKPOINT_FORMAT_NO_DOMAIN) &&
         virDomainDefFormatInternal(def->parent.dom, xmlopt,
-                                   caps, buf, domainflags) < 0)
+                                   buf, domainflags) < 0)
         goto error;
 
     virBufferAdjustIndent(buf, -2);

src/conf/domain_conf.c

@@ -23607,8 +23607,8 @@ virDomainDefCheckABIStabilityFlags(virDomainDefPtr src,
  error:
     virErrorPreserveLast(&err);
 
-    strSrc = virDomainDefFormat(src, xmlopt, NULL, 0);
-    strDst = virDomainDefFormat(dst, xmlopt, NULL, 0);
+    strSrc = virDomainDefFormat(src, xmlopt, 0);
+    strDst = virDomainDefFormat(dst, xmlopt, 0);
     VIR_DEBUG("XMLs that failed stability check were: src=\"%s\", dst=\"%s\"",
               NULLSTR(strSrc), NULLSTR(strDst));
 
@@ -28295,11 +28295,10 @@ virDomainDefFormatFeatures(virBufferPtr buf,
 int
 virDomainDefFormatInternal(virDomainDefPtr def,
                            virDomainXMLOptionPtr xmlopt,
-                           virCapsPtr caps,
                            virBufferPtr buf,
                            unsigned int flags)
 {
-    return virDomainDefFormatInternalSetRootName(def, xmlopt, caps, buf,
+    return virDomainDefFormatInternalSetRootName(def, xmlopt, buf,
                                                  "domain", flags);
 }
 
@@ -28311,7 +28310,6 @@ virDomainDefFormatInternal(virDomainDefPtr def,
 int
 virDomainDefFormatInternalSetRootName(virDomainDefPtr def,
                                       virDomainXMLOptionPtr xmlopt,
-                                      virCapsPtr caps G_GNUC_UNUSED,
                                       virBufferPtr buf,
                                       const char *rootname,
                                       unsigned int flags)
@@ -28850,13 +28848,12 @@ unsigned int virDomainDefFormatConvertXMLFlags(unsigned int flags)
 char *
 virDomainDefFormat(virDomainDefPtr def,
                    virDomainXMLOptionPtr xmlopt,
-                   virCapsPtr caps,
                    unsigned int flags)
 {
     virBuffer buf = VIR_BUFFER_INITIALIZER;
 
     virCheckFlags(VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS, NULL);
-    if (virDomainDefFormatInternal(def, xmlopt, caps, &buf, flags) < 0)
+    if (virDomainDefFormatInternal(def, xmlopt, &buf, flags) < 0)
         return NULL;
 
     return virBufferContentAndReset(&buf);
@@ -28866,7 +28863,6 @@ virDomainDefFormat(virDomainDefPtr def,
 char *
 virDomainObjFormat(virDomainObjPtr obj,
                    virDomainXMLOptionPtr xmlopt,
-                   virCapsPtr caps,
                    unsigned int flags)
 {
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
@@ -28891,7 +28887,7 @@ virDomainObjFormat(virDomainObjPtr obj,
         xmlopt->privateData.format(&buf, obj) < 0)
         goto error;
 
-    if (virDomainDefFormatInternal(obj->def, xmlopt, caps, &buf, flags) < 0)
+    if (virDomainDefFormatInternal(obj->def, xmlopt, &buf, flags) < 0)
         goto error;
 
     virBufferAdjustIndent(&buf, -2);
@@ -29052,12 +29048,12 @@ virDomainDefSaveXML(virDomainDefPtr def,
 int
 virDomainDefSave(virDomainDefPtr def,
                  virDomainXMLOptionPtr xmlopt,
-                 virCapsPtr caps,
+                 virCapsPtr caps G_GNUC_UNUSED,
                  const char *configDir)
 {
     g_autofree char *xml = NULL;
 
-    if (!(xml = virDomainDefFormat(def, xmlopt, caps, VIR_DOMAIN_DEF_FORMAT_SECURE)))
+    if (!(xml = virDomainDefFormat(def, xmlopt, VIR_DOMAIN_DEF_FORMAT_SECURE)))
         return -1;
 
     return virDomainDefSaveXML(def, configDir, xml);
@@ -29066,7 +29062,7 @@ virDomainDefSave(virDomainDefPtr def,
 int
 virDomainObjSave(virDomainObjPtr obj,
                  virDomainXMLOptionPtr xmlopt,
-                 virCapsPtr caps,
+                 virCapsPtr caps G_GNUC_UNUSED,
                  const char *statusDir)
 {
     unsigned int flags = (VIR_DOMAIN_DEF_FORMAT_SECURE |
@@ -29077,7 +29073,7 @@ virDomainObjSave(virDomainObjPtr obj,
 
     g_autofree char *xml = NULL;
 
-    if (!(xml = virDomainObjFormat(obj, xmlopt, caps, flags)))
+    if (!(xml = virDomainObjFormat(obj, xmlopt, flags)))
         return -1;
 
     return virDomainDefSaveXML(obj->def, statusDir, xml);
@@ -29367,7 +29363,7 @@ virDomainUSBDeviceDefForeach(virDomainDefPtr def,
  * snapshots).  */
 virDomainDefPtr
 virDomainDefCopy(virDomainDefPtr src,
-                 virCapsPtr caps,
+                 virCapsPtr caps G_GNUC_UNUSED,
                  virDomainXMLOptionPtr xmlopt,
                  void *parseOpaque,
                  bool migratable)
@@ -29381,7 +29377,7 @@ virDomainDefCopy(virDomainDefPtr src,
         format_flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE | VIR_DOMAIN_DEF_FORMAT_MIGRATABLE;
 
     /* Easiest to clone via a round-trip through XML.  */
-    if (!(xml = virDomainDefFormat(src, xmlopt, caps, format_flags)))
+    if (!(xml = virDomainDefFormat(src, xmlopt, format_flags)))
         return NULL;
 
     return virDomainDefParseString(xml, caps, xmlopt, parseOpaque, parse_flags);

src/conf/domain_conf.h

@@ -3101,26 +3101,22 @@ unsigned int virDomainDefFormatConvertXMLFlags(unsigned int flags);
 
 char *virDomainDefFormat(virDomainDefPtr def,
                          virDomainXMLOptionPtr xmlopt,
-                         virCapsPtr caps,
                          unsigned int flags)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
     ATTRIBUTE_NONNULL(3);
 char *virDomainObjFormat(virDomainObjPtr obj,
                          virDomainXMLOptionPtr xmlopt,
-                         virCapsPtr caps,
                          unsigned int flags)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
     ATTRIBUTE_NONNULL(3);
 int virDomainDefFormatInternal(virDomainDefPtr def,
                                virDomainXMLOptionPtr xmlopt,
-                               virCapsPtr caps,
                                virBufferPtr buf,
                                unsigned int flags)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
     ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
 int virDomainDefFormatInternalSetRootName(virDomainDefPtr def,
                                           virDomainXMLOptionPtr xmlopt,
-                                          virCapsPtr caps,
                                           virBufferPtr buf,
                                           const char *rootname,
                                           unsigned int flags)

src/conf/snapshot_conf.c

@@ -838,7 +838,7 @@ static int
 virDomainSnapshotDefFormatInternal(virBufferPtr buf,
                                    const char *uuidstr,
                                    virDomainSnapshotDefPtr def,
-                                   virCapsPtr caps,
+                                   virCapsPtr caps G_GNUC_UNUSED,
                                    virDomainXMLOptionPtr xmlopt,
                                    unsigned int flags)
 {
@@ -892,7 +892,7 @@ virDomainSnapshotDefFormatInternal(virBufferPtr buf,
 
     if (def->parent.dom) {
         if (virDomainDefFormatInternal(def->parent.dom, xmlopt,
-                                       caps, buf, domainflags) < 0)
+                                       buf, domainflags) < 0)
             goto error;
     } else if (uuidstr) {
         virBufferAddLit(buf, "<domain>\n");
@@ -904,7 +904,7 @@ virDomainSnapshotDefFormatInternal(virBufferPtr buf,
 
     if (def->parent.inactiveDom) {
         if (virDomainDefFormatInternalSetRootName(def->parent.inactiveDom, xmlopt,
-                                                  caps, buf, "inactiveDomain",
+                                                  buf, "inactiveDomain",
                                                   domainflags) < 0)
             goto error;
     }

src/esx/esx_driver.c

@@ -2648,7 +2648,7 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
         if (powerState != esxVI_VirtualMachinePowerState_PoweredOff)
             def->id = id;
 
-        xml = virDomainDefFormat(def, priv->xmlopt, priv->caps,
+        xml = virDomainDefFormat(def, priv->xmlopt,
                                  virDomainDefFormatConvertXMLFlags(flags));
     }
 
@@ -2706,7 +2706,7 @@ esxConnectDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat,
     def = virVMXParseConfig(&ctx, priv->xmlopt, priv->caps, nativeConfig);
 
     if (def)
-        xml = virDomainDefFormat(def, priv->xmlopt, priv->caps,
+        xml = virDomainDefFormat(def, priv->xmlopt,
                                  VIR_DOMAIN_DEF_FORMAT_INACTIVE);
 
     virDomainDefFree(def);

src/hyperv/hyperv_driver.c

@@ -887,7 +887,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
     /* FIXME: devices section is totally missing */
 
     /* XXX xmlopts must be non-NULL */
-    xml = virDomainDefFormat(def, NULL, NULL,
+    xml = virDomainDefFormat(def, NULL,
                              virDomainDefFormatConvertXMLFlags(flags));
 
  cleanup:

src/libxl/libxl_domain.c

@@ -851,7 +851,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver,
 
     /* now that we know it's stopped call the hook if present */
     if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) {
-        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, cfg->caps, 0);
+        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, 0);
 
         /* we can't stop the operation even if the script raised an error */
         ignore_value(virHookCall(VIR_HOOK_DRIVER_LIBXL, vm->def->name,
@@ -920,7 +920,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver,
 
     /* The "release" hook cleans up additional resources */
     if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) {
-        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, cfg->caps, 0);
+        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, 0);
 
         /* we can't stop the operation even if the script raised an error */
         ignore_value(virHookCall(VIR_HOOK_DRIVER_LIBXL, vm->def->name,
@@ -1327,7 +1327,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
 
     /* Run an early hook to set-up missing devices */
     if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) {
-        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, cfg->caps, 0);
+        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, 0);
         int hookret;
 
         hookret = virHookCall(VIR_HOOK_DRIVER_LIBXL, vm->def->name,
@@ -1365,7 +1365,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
 
     /* now that we know it is about to start call the hook if present */
     if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) {
-        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, cfg->caps, 0);
+        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, 0);
         int hookret;
 
         hookret = virHookCall(VIR_HOOK_DRIVER_LIBXL, vm->def->name,
@@ -1450,7 +1450,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
         libxlDomainCreateChannelPTY(vm->def, cfg->ctx);
 #endif
 
-    if ((dom_xml = virDomainDefFormat(vm->def, driver->xmlopt, cfg->caps, 0)) == NULL)
+    if ((dom_xml = virDomainDefFormat(vm->def, driver->xmlopt, 0)) == NULL)
         goto destroy_dom;
 
     if (libxl_userdata_store(cfg->ctx, domid, "libvirt-xml",
@@ -1478,7 +1478,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
 
     /* finally we can call the 'started' hook script if any */
     if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) {
-        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, cfg->caps, 0);
+        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, 0);
         int hookret;
 
         hookret = virHookCall(VIR_HOOK_DRIVER_LIBXL, vm->def->name,

src/libxl/libxl_driver.c

@@ -459,7 +459,7 @@ libxlReconnectDomain(virDomainObjPtr vm,
     /* now that we know it's reconnected call the hook if present */
     if (virHookPresent(VIR_HOOK_DRIVER_LIBXL) &&
         STRNEQ("Domain-0", vm->def->name)) {
-        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, cfg->caps, 0);
+        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, 0);
         int hookret;
 
         /* we can't stop the operation even if the script raised an error */
@@ -1828,7 +1828,7 @@ libxlDoDomainSave(libxlDriverPrivatePtr driver,
         goto cleanup;
     }
 
-    if ((xml = virDomainDefFormat(vm->def, driver->xmlopt, cfg->caps, 0)) == NULL)
+    if ((xml = virDomainDefFormat(vm->def, driver->xmlopt, 0)) == NULL)
         goto cleanup;
     xml_len = strlen(xml) + 1;
 
@@ -2652,7 +2652,7 @@ libxlDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
     else
         def = vm->def;
 
-    ret = virDomainDefFormat(def, driver->xmlopt, cfg->caps,
+    ret = virDomainDefFormat(def, driver->xmlopt,
                              virDomainDefFormatConvertXMLFlags(flags));
 
  cleanup:
@@ -2703,7 +2703,7 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn,
         goto cleanup;
     }
 
-    xml = virDomainDefFormat(def, driver->xmlopt, cfg->caps, VIR_DOMAIN_DEF_FORMAT_INACTIVE);
+    xml = virDomainDefFormat(def, driver->xmlopt, VIR_DOMAIN_DEF_FORMAT_INACTIVE);
 
  cleanup:
     virDomainDefFree(def);

src/libxl/libxl_migration.c

@@ -420,7 +420,7 @@ libxlDomainMigrationSrcBegin(virConnectPtr conn,
     if (!libxlDomainMigrationIsAllowed(def))
         goto endjob;
 
-    xml = virDomainDefFormat(def, driver->xmlopt, cfg->caps, VIR_DOMAIN_DEF_FORMAT_SECURE);
+    xml = virDomainDefFormat(def, driver->xmlopt, VIR_DOMAIN_DEF_FORMAT_SECURE);
     /* Valid xml means success! EndJob in the confirm phase */
     if (xml)
         goto cleanup;
@@ -494,7 +494,7 @@ libxlDomainMigrationPrepareAny(virConnectPtr dconn,
         char *xml;
         int hookret;
 
-        if (!(xml = virDomainDefFormat(*def, driver->xmlopt, cfg->caps,
+        if (!(xml = virDomainDefFormat(*def, driver->xmlopt,
                                        VIR_DOMAIN_XML_SECURE |
                                        VIR_DOMAIN_XML_MIGRATABLE)))
             return -1;

src/lxc/lxc_driver.c

@@ -987,7 +987,7 @@ static char *lxcDomainGetXMLDesc(virDomainPtr dom,
 
     ret = virDomainDefFormat((flags & VIR_DOMAIN_XML_INACTIVE) &&
                              vm->newDef ? vm->newDef : vm->def,
-                             driver->xmlopt, driver->caps,
+                             driver->xmlopt,
                              virDomainDefFormatConvertXMLFlags(flags));
 
  cleanup:
@@ -1019,7 +1019,7 @@ static char *lxcConnectDomainXMLFromNative(virConnectPtr conn,
     if (!(def = lxcParseConfigString(nativeConfig, caps, driver->xmlopt)))
         goto cleanup;
 
-    xml = virDomainDefFormat(def, driver->xmlopt, caps, 0);
+    xml = virDomainDefFormat(def, driver->xmlopt, 0);
 
  cleanup:
     virObjectUnref(caps);

src/lxc/lxc_process.c

@@ -171,7 +171,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver,
 
     /* now that we know it's stopped call the hook if present */
     if (virHookPresent(VIR_HOOK_DRIVER_LXC)) {
-        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, driver->caps, 0);
+        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, 0);
 
         /* we can't stop the operation even if the script raised an error */
         virHookCall(VIR_HOOK_DRIVER_LXC, vm->def->name,
@@ -248,7 +248,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver,
 
     /* The "release" hook cleans up additional resources */
     if (virHookPresent(VIR_HOOK_DRIVER_LXC)) {
-        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, driver->caps, 0);
+        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, 0);
 
         /* we can't stop the operation even if the script raised an error */
         virHookCall(VIR_HOOK_DRIVER_LXC, vm->def->name,
@@ -1271,7 +1271,7 @@ int virLXCProcessStart(virConnectPtr conn,
 
     /* Run an early hook to set-up missing devices */
     if (virHookPresent(VIR_HOOK_DRIVER_LXC)) {
-        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, driver->caps, 0);
+        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, 0);
         int hookret;
 
         hookret = virHookCall(VIR_HOOK_DRIVER_LXC, vm->def->name,
@@ -1379,7 +1379,7 @@ int virLXCProcessStart(virConnectPtr conn,
 
     /* now that we know it is about to start call the hook if present */
     if (virHookPresent(VIR_HOOK_DRIVER_LXC)) {
-        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, driver->caps, 0);
+        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, 0);
         int hookret;
 
         hookret = virHookCall(VIR_HOOK_DRIVER_LXC, vm->def->name,
@@ -1521,7 +1521,7 @@ int virLXCProcessStart(virConnectPtr conn,
 
     /* finally we can call the 'started' hook script if any */
     if (virHookPresent(VIR_HOOK_DRIVER_LXC)) {
-        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, driver->caps, 0);
+        char *xml = virDomainDefFormat(vm->def, driver->xmlopt, 0);
         int hookret;
 
         hookret = virHookCall(VIR_HOOK_DRIVER_LXC, vm->def->name,
@@ -1701,7 +1701,7 @@ virLXCProcessReconnectDomain(virDomainObjPtr vm,
 
         /* now that we know it's reconnected call the hook if present */
         if (virHookPresent(VIR_HOOK_DRIVER_LXC)) {
-            char *xml = virDomainDefFormat(vm->def, driver->xmlopt, driver->caps, 0);
+            char *xml = virDomainDefFormat(vm->def, driver->xmlopt, 0);
             int hookret;
 
             /* we can't stop the operation even if the script raised an error */

src/openvz/openvz_driver.c

@@ -473,7 +473,7 @@ static char *openvzDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) {
     if (!(vm = openvzDomObjFromDomain(driver, dom->uuid)))
         return NULL;
 
-    ret = virDomainDefFormat(vm->def, driver->xmlopt, driver->caps,
+    ret = virDomainDefFormat(vm->def, driver->xmlopt,
                              virDomainDefFormatConvertXMLFlags(flags));
 
     virDomainObjEndAPI(&vm);
@@ -2067,7 +2067,7 @@ openvzDomainMigrateBegin3Params(virDomainPtr domain,
         goto cleanup;
     }
 
-    xml = virDomainDefFormat(vm->def, driver->xmlopt, driver->caps,
+    xml = virDomainDefFormat(vm->def, driver->xmlopt,
                              VIR_DOMAIN_DEF_FORMAT_SECURE);
 
  cleanup:

src/phyp/phyp_driver.c

@@ -3252,7 +3252,7 @@ phypDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
     if (virDomainDefSetVcpus(&def, vcpus) < 0)
         goto err;
 
-    return virDomainDefFormat(&def, phyp_driver->xmlopt, phyp_driver->caps,
+    return virDomainDefFormat(&def, phyp_driver->xmlopt,
                               virDomainDefFormatConvertXMLFlags(flags));
 
  err:

src/qemu/qemu_domain.c

@@ -9218,7 +9218,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver,
     }
 
  format:
-    ret = virDomainDefFormatInternal(def, driver->xmlopt, caps, buf,
+    ret = virDomainDefFormatInternal(def, driver->xmlopt, buf,
                                      virDomainDefFormatConvertXMLFlags(flags));
 
  cleanup:

src/security/security_apparmor.c

@@ -168,7 +168,7 @@ load_profile(virSecurityManagerPtr mgr G_GNUC_UNUSED,
     char *xml = NULL;
     virCommandPtr cmd = NULL;
 
-    xml = virDomainDefFormat(def, NULL, NULL, VIR_DOMAIN_DEF_FORMAT_SECURE);
+    xml = virDomainDefFormat(def, NULL, VIR_DOMAIN_DEF_FORMAT_SECURE);
     if (!xml)
         goto cleanup;
 

src/test/test_driver.c

@@ -2178,7 +2178,7 @@ testDomainSaveImageWrite(testDriverPtr driver,
     int fd = -1;
     g_autofree char *xml = NULL;
 
-    xml = virDomainDefFormat(def, driver->xmlopt, driver->caps,
+    xml = virDomainDefFormat(def, driver->xmlopt,
                              VIR_DOMAIN_DEF_FORMAT_SECURE);
 
     if (xml == NULL) {
@@ -2468,7 +2468,7 @@ testDomainSaveImageGetXMLDesc(virConnectPtr conn,
     if ((fd = testDomainSaveImageOpen(privconn, path, &def)) < 0)
         goto cleanup;
 
-    ret = virDomainDefFormat(def, privconn->xmlopt, privconn->caps,
+    ret = virDomainDefFormat(def, privconn->xmlopt,
                              VIR_DOMAIN_DEF_FORMAT_SECURE);
 
  cleanup:
@@ -3180,7 +3180,7 @@ static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
     def = (flags & VIR_DOMAIN_XML_INACTIVE) &&
         privdom->newDef ? privdom->newDef : privdom->def;
 
-    ret = virDomainDefFormat(def, privconn->xmlopt, privconn->caps,
+    ret = virDomainDefFormat(def, privconn->xmlopt,
                              virDomainDefFormatConvertXMLFlags(flags));
 
     virDomainObjEndAPI(&privdom);

src/vbox/vbox_common.c

@@ -4126,7 +4126,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
     /* dump USB devices/filters if active */
     vboxHostDeviceGetXMLDesc(data, def, machine);
 
-    ret = virDomainDefFormat(def, data->xmlopt, data->caps,
+    ret = virDomainDefFormat(def, data->xmlopt,
                              virDomainDefFormatConvertXMLFlags(flags));
 
  cleanup:

src/vmware/vmware_driver.c

@@ -940,7 +940,7 @@ vmwareDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
     if (!(vm = vmwareDomObjFromDomain(driver, dom->uuid)))
         return NULL;
 
-    ret = virDomainDefFormat(vm->def, driver->xmlopt, driver->caps,
+    ret = virDomainDefFormat(vm->def, driver->xmlopt,
                              virDomainDefFormatConvertXMLFlags(flags));
 
     virDomainObjEndAPI(&vm);
@@ -973,7 +973,7 @@ vmwareConnectDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat,
     def = virVMXParseConfig(&ctx, driver->xmlopt, driver->caps, nativeConfig);
 
     if (def != NULL)
-        xml = virDomainDefFormat(def, driver->xmlopt, driver->caps,
+        xml = virDomainDefFormat(def, driver->xmlopt,
                                  VIR_DOMAIN_DEF_FORMAT_INACTIVE);
 
     virDomainDefFree(def);

src/vz/vz_driver.c

@@ -733,7 +733,7 @@ vzDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
     def = (flags & VIR_DOMAIN_XML_INACTIVE) &&
         dom->newDef ? dom->newDef : dom->def;
 
-    ret = virDomainDefFormat(def, driver->xmlopt, privconn->driver->caps, flags);
+    ret = virDomainDefFormat(def, driver->xmlopt, flags);
 
  cleanup:
     virDomainObjEndAPI(&dom);
@@ -2877,7 +2877,7 @@ vzDomainMigrateBeginStep(virDomainObjPtr dom,
                      | VZ_MIGRATION_COOKIE_DOMAIN_NAME) < 0)
         return NULL;
 
-    return virDomainDefFormat(dom->def, driver->xmlopt, driver->caps,
+    return virDomainDefFormat(dom->def, driver->xmlopt,
                               VIR_DOMAIN_XML_MIGRATABLE);
 }
 

tests/bhyveargv2xmltest.c

@@ -77,7 +77,7 @@ testCompareXMLToArgvFiles(const char *xmlfile,
         goto fail;
     }
 
-    if (vmdef && !(actualxml = virDomainDefFormat(vmdef, driver.caps, 0)))
+    if (vmdef && !(actualxml = virDomainDefFormat(vmdef, driver.xmlopt, 0)))
         goto fail;
 
     if (vmdef && virTestCompareToFile(actualxml, xmlfile) < 0)

tests/lxcconf2xmltest.c

@@ -41,7 +41,7 @@ testCompareXMLToConfigFiles(const char *xmlfile,
         if (testSanitizeDef(vmdef) < 0)
             goto fail;
 
-        if (!(actualxml = virDomainDefFormat(vmdef, driver->xmlopt, driver->caps, 0)))
+        if (!(actualxml = virDomainDefFormat(vmdef, driver->xmlopt, 0)))
             goto fail;
 
         if (virTestCompareToFile(actualxml, xmlfile) < 0)

tests/openvzutilstest.c

@@ -116,7 +116,7 @@ testReadNetworkConf(const void *data G_GNUC_UNUSED)
         goto cleanup;
     }
 
-    actual = virDomainDefFormat(def, driver.xmlopt, driver.caps, VIR_DOMAIN_DEF_FORMAT_INACTIVE);
+    actual = virDomainDefFormat(def, driver.xmlopt, VIR_DOMAIN_DEF_FORMAT_INACTIVE);
 
     if (actual == NULL) {
         fprintf(stderr, "ERROR: %s\n", virGetLastErrorMessage());

tests/qemuhotplugtest.c

@@ -200,7 +200,7 @@ testQemuHotplugCheckResult(virDomainObjPtr vm,
     char *actual;
     int ret;
 
-    actual = virDomainDefFormat(vm->def, driver.xmlopt, driver.caps,
+    actual = virDomainDefFormat(vm->def, driver.xmlopt,
                                 VIR_DOMAIN_DEF_FORMAT_SECURE);
     if (!actual)
         return -1;
@@ -466,7 +466,7 @@ testQemuHotplugCpuFinalize(struct testQemuHotplugCpuData *data)
     char *configXML = NULL;
 
     if (data->file_xml_res_live) {
-        if (!(activeXML = virDomainDefFormat(data->vm->def, driver.xmlopt, driver.caps,
+        if (!(activeXML = virDomainDefFormat(data->vm->def, driver.xmlopt,
                                              VIR_DOMAIN_DEF_FORMAT_SECURE)))
             goto cleanup;
 
@@ -475,7 +475,7 @@ testQemuHotplugCpuFinalize(struct testQemuHotplugCpuData *data)
     }
 
     if (data->file_xml_res_conf) {
-        if (!(configXML = virDomainDefFormat(data->vm->newDef, driver.xmlopt, driver.caps,
+        if (!(configXML = virDomainDefFormat(data->vm->newDef, driver.xmlopt,
                                              VIR_DOMAIN_DEF_FORMAT_SECURE |
                                              VIR_DOMAIN_DEF_FORMAT_INACTIVE)))
             goto cleanup;

tests/qemuxml2xmltest.c

@@ -68,7 +68,7 @@ testCompareStatusXMLToXMLFiles(const void *opaque)
         goto cleanup;
     }
 
-    if (!(actual = virDomainObjFormat(obj, driver.xmlopt, NULL,
+    if (!(actual = virDomainObjFormat(obj, driver.xmlopt,
                                       VIR_DOMAIN_DEF_FORMAT_SECURE |
                                       VIR_DOMAIN_DEF_FORMAT_STATUS |
                                       VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET |

tests/testutils.c

@@ -1140,7 +1140,7 @@ testCompareDomXML2XMLFiles(virCapsPtr caps, virDomainXMLOptionPtr xmlopt,
         goto out;
     }
 
-    if (!(actual = virDomainDefFormat(def, xmlopt, caps, format_flags))) {
+    if (!(actual = virDomainDefFormat(def, xmlopt, format_flags))) {
         result = TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_FORMAT;
         goto out;
     }

tests/vmx2xmltest.c

@@ -84,7 +84,7 @@ testCompareFiles(const char *vmx, const char *xml)
         goto cleanup;
     }
 
-    if (!(formatted = virDomainDefFormat(def, xmlopt, caps,
+    if (!(formatted = virDomainDefFormat(def, xmlopt,
                                          VIR_DOMAIN_DEF_FORMAT_SECURE)))
         goto cleanup;
 

tests/xlconfigtest.c

@@ -146,7 +146,7 @@ testCompareFormatXML(const char *xlcfg, const char *xml, bool replaceVars)
     if (!(def = xenParseXL(conf, cfg->caps, driver->xmlopt)))
         goto fail;
 
-    if (!(gotxml = virDomainDefFormat(def, driver->xmlopt, cfg->caps,
+    if (!(gotxml = virDomainDefFormat(def, driver->xmlopt,
                                       VIR_DOMAIN_XML_INACTIVE |
                                       VIR_DOMAIN_XML_SECURE)))
         goto fail;

tests/xmconfigtest.c

@@ -101,7 +101,7 @@ testCompareFormatXML(const char *xmcfg, const char *xml)
     if (!(def = xenParseXM(conf, cfg->caps, driver->xmlopt)))
         goto fail;
 
-    if (!(gotxml = virDomainDefFormat(def, driver->xmlopt, cfg->caps, VIR_DOMAIN_DEF_FORMAT_SECURE)))
+    if (!(gotxml = virDomainDefFormat(def, driver->xmlopt, VIR_DOMAIN_DEF_FORMAT_SECURE)))
         goto fail;
 
     if (virTestCompareToFile(gotxml, xml) < 0)