[PATCH 8/8] Compile libvirt under Windows (Cygwin)

["Richard W.M. Jones" <rjones@xxxxxxxxxx>]

This patch just disables all server and QEMU-related code if we 
configure --without-qemu.

As discussed in the intro this should be made more granular so we can 
disable server or QEMU features alone.

Rich.

--
Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/
Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod
Street, Windsor, Berkshire, SL4 1TE, United Kingdom.  Registered in
England and Wales under Company Registration No. 03798903

Index: src/bridge.c
===================================================================
RCS file: /data/cvs/libvirt/src/bridge.c,v
retrieving revision 1.5
diff -u -r1.5 bridge.c
--- src/bridge.c	21 Nov 2007 11:46:05 -0000	1.5
+++ src/bridge.c	24 Nov 2007 14:21:49 -0000
@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#ifdef WITH_QEMU
+
 #include "bridge.h"
 
 #include <stdlib.h>
@@ -767,6 +769,8 @@
     return retval;
 }
 
+#endif /* WITH_QEMU */
+
 /*
  * Local variables:
  *  indent-tabs-mode: nil
Index: src/bridge.h
===================================================================
RCS file: /data/cvs/libvirt/src/bridge.h,v
retrieving revision 1.2
diff -u -r1.2 bridge.h
--- src/bridge.h	29 Jun 2007 13:23:13 -0000	1.2
+++ src/bridge.h	24 Nov 2007 14:21:49 -0000
@@ -22,6 +22,10 @@
 #ifndef __QEMUD_BRIDGE_H__
 #define __QEMUD_BRIDGE_H__
 
+#include "config.h"
+
+#ifdef WITH_QEMU
+
 #include <net/if.h>
 #include <netinet/in.h>
 
@@ -97,6 +101,8 @@
                                  const char *bridge,
                                  int *enable);
 
+#endif /* WITH_QEMU */
+
 #endif /* __QEMUD_BRIDGE_H__ */
 
 /*
Index: src/qemu_conf.c
===================================================================
RCS file: /data/cvs/libvirt/src/qemu_conf.c,v
retrieving revision 1.18
diff -u -r1.18 qemu_conf.c
--- src/qemu_conf.c	7 Nov 2007 12:29:37 -0000	1.18
+++ src/qemu_conf.c	24 Nov 2007 14:21:51 -0000
@@ -21,7 +21,9 @@
  * Author: Daniel P. Berrange <berrange@xxxxxxxxxx>
  */
 
-#include <config.h>
+#include "config.h"
+
+#ifdef WITH_QEMU
 
 #include <dirent.h>
 #include <string.h>
@@ -3264,6 +3266,7 @@
     return 0;
 }
 
+#endif /* WITH_QEMU */
 
 /*
  * Local variables:
Index: src/qemu_conf.h
===================================================================
RCS file: /data/cvs/libvirt/src/qemu_conf.h,v
retrieving revision 1.12
diff -u -r1.12 qemu_conf.h
--- src/qemu_conf.h	15 Nov 2007 10:56:24 -0000	1.12
+++ src/qemu_conf.h	24 Nov 2007 14:21:51 -0000
@@ -24,6 +24,10 @@
 #ifndef __QEMUD_CONF_H
 #define __QEMUD_CONF_H
 
+#include "config.h"
+
+#ifdef WITH_QEMU
+
 #include "internal.h"
 #include "bridge.h"
 #include "iptables.h"
@@ -429,7 +433,9 @@
 };
 extern struct qemu_arch_info qemudArchs[];
 
-#endif
+#endif /* WITH_QEMU */
+
+#endif /* __QEMUD_CONF_H */
 
 /*
  * Local variables:
Index: src/qemu_driver.c
===================================================================
RCS file: /data/cvs/libvirt/src/qemu_driver.c,v
retrieving revision 1.36
diff -u -r1.36 qemu_driver.c
--- src/qemu_driver.c	21 Nov 2007 11:46:05 -0000	1.36
+++ src/qemu_driver.c	24 Nov 2007 14:21:53 -0000
@@ -21,7 +21,9 @@
  * Author: Daniel P. Berrange <berrange@xxxxxxxxxx>
  */
 
-#include <config.h>
+#include "config.h"
+
+#ifdef WITH_QEMU
 
 #define _GNU_SOURCE /* for asprintf */
 
@@ -2922,6 +2924,8 @@
     return 0;
 }
 
+#endif /* WITH_QEMU */
+
 /*
  * Local variables:
  *  indent-tabs-mode: nil
Index: src/qemu_driver.h
===================================================================
RCS file: /data/cvs/libvirt/src/qemu_driver.h,v
retrieving revision 1.2
diff -u -r1.2 qemu_driver.h
--- src/qemu_driver.h	29 Jun 2007 13:23:13 -0000	1.2
+++ src/qemu_driver.h	24 Nov 2007 14:21:53 -0000
@@ -25,12 +25,17 @@
 #ifndef QEMUD_DRIVER_H
 #define QEMUD_DRIVER_H
 
+#include "config.h"
+
+#ifdef WITH_QEMU
+
 #include "internal.h"
 
 int qemudRegister(void);
 
-#endif
+#endif /* WITH_QEMU */
 
+#endif /* QEMUD_DRIVER_H */
 
 /*
  * Local variables:
Index: src/test.c
===================================================================
RCS file: /data/cvs/libvirt/src/test.c,v
retrieving revision 1.51
diff -u -r1.51 test.c
--- src/test.c	14 Nov 2007 11:40:57 -0000	1.51
+++ src/test.c	24 Nov 2007 14:21:54 -0000
@@ -21,6 +21,8 @@
  * Daniel Berrange <berrange@xxxxxxxxxx>
  */
 
+#include "config.h"
+
 #ifdef WITH_TEST
 
 #define _GNU_SOURCE /* for asprintf */

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature

--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list