Moved SEXPR formatting functions to xenxs

src/xen/xend_internal.h

@@ -91,18 +91,6 @@ xenDaemonDomainFetch(virConnectPtr xend,
                      const char *cpus);
 
 
-int
-xenDaemonFormatSxprChr(virDomainChrDefPtr def,
-                       virBufferPtr buf);
-int
-xenDaemonFormatSxprSound(virDomainDefPtr def,
-                         virBufferPtr buf);
-
-char *
-xenDaemonFormatSxpr(virConnectPtr conn,
-                    virDomainDefPtr def,
-                    int xendConfigVersion);
-
   int is_sound_model_valid(const char *model);
   int is_sound_model_conflict(const char *model, const char *soundstr);
 

src/xenxs/xen_sxpr.h

@@ -59,4 +59,36 @@ virDomainChrDefPtr
 xenDaemonParseSxprChar(const char *value,
                        const char *tty);
 
+int
+xenDaemonFormatSxprDisk(virConnectPtr conn ATTRIBUTE_UNUSED,
+                        virDomainDiskDefPtr def,
+                        virBufferPtr buf,
+                        int hvm,
+                        int xendConfigVersion,
+                        int isAttach);
+int
+xenDaemonFormatSxprNet(virConnectPtr conn ATTRIBUTE_UNUSED,
+                       virDomainNetDefPtr def,
+                       virBufferPtr buf,
+                       int hvm,
+                       int xendConfigVersion,
+                       int isAttach);
+
+int
+xenDaemonFormatSxprOnePCI(virDomainHostdevDefPtr def,
+                          virBufferPtr buf,
+                          int detach);
+
+int
+xenDaemonFormatSxprChr(virDomainChrDefPtr def,
+                       virBufferPtr buf);
+int
+xenDaemonFormatSxprSound(virDomainDefPtr def,
+                         virBufferPtr buf);
+
+char *
+xenDaemonFormatSxpr(virConnectPtr conn,
+                    virDomainDefPtr def,
+                    int xendConfigVersion);
+
 #endif /* __VIR_XEN_SXPR_H__ */

src/xenxs/xenxs_private.h

@@ -27,6 +27,24 @@
 
 # include "internal.h"
 
+# include <stdint.h>
+# include <xen/xen.h>
+
+/* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public
+ * headers.  Its semantic was retained with XEN_LEGACY_MAX_VCPUS.
+ * Ensure MAX_VIRT_CPUS is defined accordingly.
+ */
+# if !defined(MAX_VIRT_CPUS) && defined(XEN_LEGACY_MAX_VCPUS)
+#  define MAX_VIRT_CPUS XEN_LEGACY_MAX_VCPUS
+# endif
+
+# ifdef WITH_RHEL5_API
+#  define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0
+#  define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2
+# else
+#  define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3
+#  define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3
+# endif
 
 # define VIR_FROM_THIS VIR_FROM_NONE
 

tests/xml2sexprtest.c

@@ -10,6 +10,7 @@
 
 #include "internal.h"
 #include "xen/xend_internal.h"
+#include "xenxs/xen_sxpr.h"
 #include "testutils.h"
 #include "testutilsxen.h"