5:34 a.m.
The ignore_value macro is used across libvirt. This patch includes it in
the internal header and cleans all other includes.
---
New in series, optional.
---
src/conf/domain_audit.c | 1 -
src/conf/domain_conf.c | 1 -
src/conf/virdomainlist.c | 1 -
src/internal.h | 1 +
src/network/bridge_driver.c | 1 -
src/node_device/node_device_hal.c | 1 -
src/openvz/openvz_conf.c | 1 -
src/qemu/qemu_domain.c | 1 -
src/qemu/qemu_monitor_json.c | 1 -
src/util/command.c | 1 -
src/util/event_poll.c | 1 -
src/util/logging.c | 1 -
src/util/memory.c | 1 -
src/util/threadpool.c | 1 -
src/util/virfile.h | 1 -
src/util/virnetdevbandwidth.c | 1 -
src/xenapi/xenapi_driver.c | 1 -
tests/shunloadtest.c | 1 -
18 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
index 653657b..e3f3681 100644
--- a/src/conf/domain_audit.c
+++ b/src/conf/domain_audit.c
@@ -31,7 +31,6 @@
#include "uuid.h"
#include "logging.h"
#include "memory.h"
-#include "ignore-value.h"
/* Return nn:mm in hex for block and character devices, and NULL
* for other file types, stat failure, or allocation failure. */
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 221e1d0..ada517b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -44,7 +44,6 @@
#include "c-ctype.h"
#include "logging.h"
#include "nwfilter_conf.h"
-#include "ignore-value.h"
#include "storage_file.h"
#include "virfile.h"
#include "bitmap.h"
diff --git a/src/conf/virdomainlist.c b/src/conf/virdomainlist.c
index 8889fee..5a399fd 100644
--- a/src/conf/virdomainlist.c
+++ b/src/conf/virdomainlist.c
@@ -30,7 +30,6 @@
#include "memory.h"
#include "datatypes.h"
#include "virterror_internal.h"
-#include "ignore-value.h"
#define VIR_FROM_THIS VIR_FROM_DOMAIN
diff --git a/src/internal.h b/src/internal.h
index 1b1598b..856b1ee 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -45,6 +45,7 @@
# include "libvirt_internal.h"
# include "c-strcase.h"
+# include "ignore-value.h"
/* On architectures which lack these limits, define them (ie. Cygwin).
* Note that the libvirt code should be robust enough to handle the
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 5f3132c..bebb255 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -58,7 +58,6 @@
#include "logging.h"
#include "dnsmasq.h"
#include "configmake.h"
-#include "ignore-value.h"
#include "virnetdev.h"
#include "virnetdevbridge.h"
#include "virnetdevtap.h"
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index b2e502e..7f8b076 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -38,7 +38,6 @@
#include "pci.h"
#include "logging.h"
#include "node_device_driver.h"
-#include "ignore-value.h"
#include "virdbus.h"
#define VIR_FROM_THIS VIR_FROM_NODEDEV
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 72cd1e6..31556be 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -53,7 +53,6 @@
#include "nodeinfo.h"
#include "virfile.h"
#include "command.h"
-#include "ignore-value.h"
#define VIR_FROM_THIS VIR_FROM_OPENVZ
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 3752ddf..d0a65fd 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -32,7 +32,6 @@
#include "virterror_internal.h"
#include "c-ctype.h"
#include "cpu/cpu.h"
-#include "ignore-value.h"
#include "uuid.h"
#include "virfile.h"
#include "domain_event.h"
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 9030347..6ea61cd 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -41,7 +41,6 @@
#include "datatypes.h"
#include "virterror_internal.h"
#include "json.h"
-#include "ignore-value.h"
#ifdef WITH_DTRACE_PROBES
# include "libvirt_qemu_probes.h"
diff --git a/src/util/command.c b/src/util/command.c
index 62848cd..5838d45 100644
--- a/src/util/command.c
+++ b/src/util/command.c
@@ -41,7 +41,6 @@
#include "virfile.h"
#include "virpidfile.h"
#include "buf.h"
-#include "ignore-value.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/event_poll.c b/src/util/event_poll.c
index 038e75f..3841673 100644
--- a/src/util/event_poll.c
+++ b/src/util/event_poll.c
@@ -37,7 +37,6 @@
#include "memory.h"
#include "util.h"
#include "virfile.h"
-#include "ignore-value.h"
#include "virterror_internal.h"
#include "virtime.h"
diff --git a/src/util/logging.c b/src/util/logging.c
index cf62184..f8233cd 100644
--- a/src/util/logging.c
+++ b/src/util/logging.c
@@ -38,7 +38,6 @@
# include <execinfo.h>
#endif
-#include "ignore-value.h"
#include "virterror_internal.h"
#include "logging.h"
#include "memory.h"
diff --git a/src/util/memory.c b/src/util/memory.c
index bfa32a8..90ca29a 100644
--- a/src/util/memory.c
+++ b/src/util/memory.c
@@ -24,7 +24,6 @@
#include <stdlib.h>
#include "memory.h"
-#include "ignore-value.h"
#if TEST_OOM
diff --git a/src/util/threadpool.c b/src/util/threadpool.c
index e8689d9..305a22f 100644
--- a/src/util/threadpool.c
+++ b/src/util/threadpool.c
@@ -29,7 +29,6 @@
#include "memory.h"
#include "threads.h"
#include "virterror_internal.h"
-#include "ignore-value.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virfile.h b/src/util/virfile.h
index 6882a73..fb8109b 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -29,7 +29,6 @@
# include <stdio.h>
# include "internal.h"
-# include "ignore-value.h"
typedef enum virFileCloseFlags {
VIR_FILE_CLOSE_PRESERVE_ERRNO = 1 << 0,
diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index b9bd2e3..596ffd6 100644
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -26,7 +26,6 @@
#include "command.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "ignore-value.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 0ad6aff..298ab21 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -40,7 +40,6 @@
#include "xenapi_driver.h"
#include "xenapi_driver_private.h"
#include "xenapi_utils.h"
-#include "ignore-value.h"
#define VIR_FROM_THIS VIR_FROM_XENAPI
diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c
index 8113ef3..45ef0a1 100644
--- a/tests/shunloadtest.c
+++ b/tests/shunloadtest.c
@@ -50,7 +50,6 @@
# include <signal.h>
# include "internal.h"
-# include "ignore-value.h"
# include "testutils.h"
pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
--
1.7.3.4