Disable Xen specific functions if Xen driver is disabled

diff --git a/ChangeLog b/ChangeLog
index a28061caeae1ae479fbcde7c7f099a4babcabee0..7fb53b9f093f5d3506aa289f7ddc297421f6d45f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 30 17:50:34 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/xml.c, src/xml.h: Disable xen specific functions if
+       Xen driver is disabled.
+       * tests/xml2sexprtest.c: Disable if xen driver is disabled
+
 Fri Nov 30 16:36:34 CET 2007 Jim Meyering <meyering@redhat.com>
 
        Detect heap allocation failure; factor out some duplication.

diff --git a/src/xml.c b/src/xml.c
index b2bee98d127dffa812d01b8627511d762592368e..c75b0ced818335b0ef5509d9aa9366898f93f6b1 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -57,7 +57,7 @@ virXMLError(virConnectPtr conn, virErrorNumber error, const char *info,
  * Parser and converter for the CPUset strings used in libvirt         *
  *                                                                     *
  ************************************************************************/
-
+#if WITH_XEN
 /**
  * skipSpaces:
  * @str: pointer to the char pointer used
@@ -448,6 +448,7 @@ virConvertCpuSet(virConnectPtr conn, const char *str, int maxcpu) {
     free(cpuset);
     return (res);
 }
+#endif /* WITH_XEN */
 #ifndef PROXY
 
 /************************************************************************
@@ -694,7 +695,7 @@ virXPathNodeSet(const char *xpath, xmlXPathContextPtr ctxt,
  * Converter functions to go from the XML tree to an S-Expr for Xen    *
  *                                                                     *
  ************************************************************************/
-
+#if WITH_XEN
 /**
  * virtDomainParseXMLGraphicsDescImage:
  * @conn: pointer to the hypervisor connection
@@ -1625,11 +1626,7 @@ virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name,
 
     str = virXPathString("string(/domain/vcpu/@cpuset)", ctxt);
     if (str != NULL) {
-#ifdef WITH_XEN
         int maxcpu = xenNbCpus(conn);
-#else
-        int maxcpu = 64;
-#endif
         char *cpuset = NULL;
         char *ranges = NULL;
         const char *cur = str;
@@ -1879,6 +1876,7 @@ virParseXMLDevice(virConnectPtr conn, const char *xmldesc, int hvm,
     goto cleanup;
 }
 
+
 /**
  * virDomainXMLDevID:
  * @domain: pointer to domain object
@@ -1901,9 +1899,7 @@ virDomainXMLDevID(virDomainPtr domain, const char *xmldesc, char *class,
     xmlNodePtr node, cur;
     xmlChar *attr = NULL;
 
-#ifdef WITH_XEN
     char *xref;
-#endif /* WITH_XEN */
     int ret = 0;
 
     xml = xmlReadDoc((const xmlChar *) xmldesc, "device.xml", NULL,
@@ -1925,7 +1921,6 @@ virDomainXMLDevID(virDomainPtr domain, const char *xmldesc, char *class,
             attr = xmlGetProp(cur, BAD_CAST "dev");
             if (attr == NULL)
                 goto error;
-#ifdef WITH_XEN
             xref = xenStoreDomainGetDiskID(domain->conn, domain->id,
                                               (char *) attr);
             if (xref != NULL) {
@@ -1934,11 +1929,9 @@ virDomainXMLDevID(virDomainPtr domain, const char *xmldesc, char *class,
                 ref[ref_len - 1] = '\0';
                 goto cleanup;
             }
-#else /* !WITH_XEN */
             /* hack to avoid the warning that domain is unused */
             if (domain->id < 0)
                 ret = -1;
-#endif /* !WITH_XEN */
 
             goto error;
         }
@@ -1952,7 +1945,6 @@ virDomainXMLDevID(virDomainPtr domain, const char *xmldesc, char *class,
             if (attr == NULL)
                 goto error;
 
-#ifdef WITH_XEN
             xref = xenStoreDomainGetNetworkID(domain->conn, domain->id,
                                               (char *) attr);
             if (xref != NULL) {
@@ -1961,11 +1953,9 @@ virDomainXMLDevID(virDomainPtr domain, const char *xmldesc, char *class,
                 ref[ref_len - 1] = '\0';
                 goto cleanup;
             }
-#else /* !WITH_XEN */
             /* hack to avoid the warning that domain is unused */
             if (domain->id < 0)
                 ret = -1;
-#endif /* !WITH_XEN */
 
             goto error;
         }
@@ -1981,6 +1971,7 @@ virDomainXMLDevID(virDomainPtr domain, const char *xmldesc, char *class,
         xmlFree(attr);
     return ret;
 }
+#endif /* WITH_XEN */
 #endif /* !PROXY */
 
 /*

diff --git a/src/xml.h b/src/xml.h
index 045ec4e62e9fc95fc7497ba4b7e9dfe3324e1130..af87abc5042d321bb46646d6ad79aa2c3e412884 100644 (file)
--- a/src/xml.h
+++ b/src/xml.h
@@ -32,6 +32,7 @@ int           virXPathNodeSet (const char *xpath,
                                 xmlXPathContextPtr ctxt,
                                 xmlNodePtr **list);
 
+#if WITH_XEN
 int            virParseXenCpuTopology(virConnectPtr conn,
                                 virBufferPtr xml,
                                 const char *str,
@@ -60,6 +61,7 @@ int           virDomainXMLDevID(virDomainPtr domain,
                                 char *class,
                                 char *ref,
                                 int ref_len);
+#endif
 
 #ifdef __cplusplus
 }

diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
index 608a861b993302b06b899192edc6dd16c627fa5e..1f37b21cd500212e39f7103a8ed23add98b69a0d 100644 (file)
--- a/tests/xml2sexprtest.c
+++ b/tests/xml2sexprtest.c
@@ -1,7 +1,9 @@
+
 #include "config.h"
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <sys/types.h>
 #include <fcntl.h>
@@ -10,6 +12,8 @@
 #include <sys/syslimits.h>
 #endif
 
+#if WITH_XEN
+
 #include "xml.h"
 #include "testutils.h"
 #include "internal.h"
@@ -354,3 +358,9 @@ main(int argc, char **argv)
 
     exit(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }
+
+#else /* WITH_XEN */
+
+int main (void) { exit (77); /* means 'test skipped' for automake */ }
+
+#endif /* ! WITH_XEN */