From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 13 Dec 2013 16:16:50 +0000 (+0100)
Subject: maint: Fix messy include of libvirt_internal.h
X-Git-Tag: CVE-2013-6458-1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aef39eb0211735be4eccefa2d89bee6fc3c38591;p=thirdparty%2Flibvirt.git

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 b6927ea15b..5f4cd8dddc 100644
--- 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 5035dac15c..4ba0e4194e 100644
--- 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 90d590f4b2..f743541895 100644
--- 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 f6cbfc9027..e04dcdd00b 100644
--- 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 c23a177847..a914be0ae0 100644
--- 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"