always compile iptables.c

Avoid a build error when configuring --without-xen --without-qemu.
* src/iptables.c [WITH_QEMU]: Don't #ifdef-out.
* src/iptables.h [WITH_QEMU]: Don't #ifdef-out.
* src/util.c (virRun) [__MINGW32__]: Define a stub that always fails.

diff --git a/ChangeLog b/ChangeLog
index 3449df768e865447f465fdff4187eca79b9a3748..59a4fbb441e4e8e4f2b1960e9f17226505e6507a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Nov  6 20:45:42 CET 2008 Jim Meyering <meyering@redhat.com>
+
+       always compile iptables.c
+       Avoid a build error when configuring --without-xen --without-qemu.
+       * src/iptables.c [WITH_QEMU]: Don't #ifdef-out.
+       * src/iptables.h [WITH_QEMU]: Don't #ifdef-out.
+       * src/util.c (virRun) [__MINGW32__]: Define a stub that always fails.
+
 Thu Nov  6 17:33:34 CET 2008 Daniel Veillard <veillard@redhat.com>
 
        * src/logging.c src/logging.h proxy/Makefile.am proxy/libvirt_proxy.c

diff --git a/src/iptables.c b/src/iptables.c
index 53e0f4130e91b2b069fd14e4d730dc0feb26eb87..ad7fddf1bfe0fd7fc404a6db506680a2e0fea5d9 100644 (file)
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -21,8 +21,6 @@
 
 #include <config.h>
 
-#if WITH_QEMU
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1120,5 +1118,3 @@ iptablesRemoveForwardMasquerade(iptablesContext *ctx,
 {
     return iptablesForwardMasquerade(ctx, network, physdev, REMOVE);
 }
-
-#endif /* WITH_QEMU */

diff --git a/src/iptables.h b/src/iptables.h
index 95f07de7b51dff741bcc642b893d4a228bd37488..fbe9b5d5999ff733ab6995d13f688dec78493a6f 100644 (file)
--- a/src/iptables.h
+++ b/src/iptables.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Red Hat, Inc.
+ * Copyright (C) 2007, 2008 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,8 +22,6 @@
 #ifndef __QEMUD_IPTABLES_H__
 #define __QEMUD_IPTABLES_H__
 
-#if WITH_QEMU
-
 typedef struct _iptablesContext iptablesContext;
 
 iptablesContext *iptablesContextNew              (void);
@@ -95,6 +93,4 @@ int              iptablesRemoveForwardMasquerade (iptablesContext *ctx,
                                                   const char *network,
                                                   const char *physdev);
 
-#endif /* WITH_QEMU */
-
 #endif /* __QEMUD_IPTABLES_H__ */

diff --git a/src/util.c b/src/util.c
index abc86d6ea2273c0e60e78e3b52500c0e5d0950b1..6141847a2ca4cc9f8c7afab95d468068b89b384d 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -579,6 +579,18 @@ virRun(virConnectPtr conn,
 
 #else /* __MINGW32__ */
 
+int
+virRun(virConnectPtr conn,
+       const char *const *argv ATTRIBUTE_UNUSED,
+       int *status)
+{
+    if (status)
+        *status = ENOTSUP;
+    else
+        ReportError (conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__);
+    return -1;
+}
+
 int
 virExec(virConnectPtr conn,
         const char *const*argv ATTRIBUTE_UNUSED,