maint: Fix messy include of libvirt_internal.h

The libvirt_internal.h header was included by the internal.h header.
This made it painful to add new stuff to the header file that would
require some more specific types. Remove inclusion by internal.h and add
it to appropriate places manually.

diff --git a/src/driver.h b/src/driver.h
index b6927ea15b1b24fd6bc3cae0b04586f5041f8ebc..5f4cd8dddca2c56eb23523d93521f7f23438cfe2 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -25,6 +25,7 @@
 # include <unistd.h>
 
 # include "internal.h"
+# include "libvirt_internal.h"
 # include "viruri.h"
 /*
  * List of registered drivers numbers

diff --git a/src/internal.h b/src/internal.h
index 5035dac15c28790142644ab009f179e95e37aa01..4ba0e4194e89e3ee3565e82f01c755cced3b213b 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -60,8 +60,6 @@
 # include "libvirt/libvirt-qemu.h"
 # include "libvirt/virterror.h"
 
-# include "libvirt_internal.h"
-
 # include "c-strcase.h"
 # include "ignore-value.h"
 

diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h
index 90d590f4b2f8413a96f03943d3881b4dd8f49e0a..f7435418959690a78f401c0c770a5100062f8f2a 100644 (file)
--- a/src/libxl/libxl_conf.h
+++ b/src/libxl/libxl_conf.h
@@ -29,6 +29,7 @@
 # include <libxl.h>
 
 # include "internal.h"
+# include "libvirt_internal.h"
 # include "domain_conf.h"
 # include "domain_event.h"
 # include "capabilities.h"

diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h
index f6cbfc9027b13c9d5d3f1acc4350e00d2bceb396..e04dcdd00bca6d46b3bc4ab7ab3969d07cdf52b8 100644 (file)
--- a/src/lxc/lxc_conf.h
+++ b/src/lxc/lxc_conf.h
@@ -26,6 +26,7 @@
 # define LXC_CONF_H
 
 # include "internal.h"
+# include "libvirt_internal.h"
 # include "domain_conf.h"
 # include "domain_event.h"
 # include "capabilities.h"

diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h
index c23a177847ba569791545c84e03d1e7cf862c4b1..a914be0ae08ed1d69a1e5840b12d504ac848fd55 100644 (file)
--- a/src/uml/uml_conf.h
+++ b/src/uml/uml_conf.h
@@ -25,6 +25,7 @@
 # define __UML_CONF_H
 
 # include "internal.h"
+# include "libvirt_internal.h"
 # include "capabilities.h"
 # include "network_conf.h"
 # include "domain_conf.h"