Moved XM formatting functions to xenxs

src/xen/xen_driver.c

@@ -1266,7 +1266,7 @@ xenUnifiedDomainXMLToNative(virConnectPtr conn,
 
     if (STREQ(format, XEN_CONFIG_FORMAT_XM)) {
         int len = MAX_CONFIG_SIZE;
-        conf = xenXMDomainConfigFormat(conn, def);
+        conf = xenXMDomainConfigFormat(conn, def, priv->xendConfigVersion);
         if (!conf)
             goto cleanup;
 

src/xen/xm_internal.h

@@ -61,8 +61,6 @@ int xenXMDomainCreate(virDomainPtr domain);
 virDomainPtr xenXMDomainDefineXML(virConnectPtr con, const char *xml);
 int xenXMDomainUndefine(virDomainPtr domain);
 
-virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, virDomainDefPtr def);
-
 int xenXMDomainBlockPeek (virDomainPtr dom, const char *path, unsigned long long offset, size_t size, void *buffer);
 
 int xenXMDomainGetAutostart(virDomainPtr dom, int *autostart);

src/xenxs/xen_sxpr.h

@@ -32,12 +32,6 @@
 # include "domain_conf.h"
 # include "sexpr.h"
 
-# ifdef __sun
-#  define DEFAULT_VIF_SCRIPT "vif-vnic"
-# else
-#  define DEFAULT_VIF_SCRIPT "vif-bridge"
-# endif
-
 /* helper functions to get the dom id from a sexpr */
 int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion);
 int xenGetDomIdFromSxpr(const struct sexpr *root, int xendConfigVersion);

src/xenxs/xen_xm.h

@@ -30,6 +30,9 @@
 # include "conf.h"
 # include "domain_conf.h"
 
+virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, virDomainDefPtr def,
+                                   int xendConfigVersion);
+
 virDomainDefPtr xenXMDomainConfigParse(virConfPtr conf, int xendConfigVersion,
                                        virCapsPtr caps);
 

src/xenxs/xenxs_private.h

@@ -48,6 +48,12 @@
 
 # define MIN_XEN_GUEST_SIZE 64  /* 64 megabytes */
 
+# ifdef __sun
+#  define DEFAULT_VIF_SCRIPT "vif-vnic"
+# else
+#  define DEFAULT_VIF_SCRIPT "vif-bridge"
+# endif
+
 # define VIR_FROM_THIS VIR_FROM_NONE
 
 # define XENXS_ERROR(code, ...)                                               \

tests/xmconfigtest.c

@@ -75,7 +75,7 @@ static int testCompareParseXML(const char *xmcfg, const char *xml,
                                         VIR_DOMAIN_XML_INACTIVE)))
         goto fail;
 
-    if (!(conf = xenXMDomainConfigFormat(conn, def)))
+    if (!(conf = xenXMDomainConfigFormat(conn, def, xendConfigVersion)))
         goto fail;
 
     if (virConfWriteMem(gotxmcfgPtr, &wrote, conf) < 0)