Rename virterror.c virterror_internal.h to virerror.{c,h}

diff --git a/cfg.mk b/cfg.mk
index 38d72e839c21d333e485c133012f2d90ffa7c15c..f9270b0eb6aefcefbb639c57da17e7b7502274b9 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -762,7 +762,7 @@ exclude_file_name_regexp--sc_libvirt_unmarked_diagnostics = \
 exclude_file_name_regexp--sc_po_check = ^(docs/|src/rpc/gendispatch\.pl$$)
 
 exclude_file_name_regexp--sc_prohibit_VIR_ERR_NO_MEMORY = \
-  ^(include/libvirt/virterror\.h|daemon/dispatch\.c|src/util/virterror\.c)$$
+  ^(include/libvirt/virterror\.h|daemon/dispatch\.c|src/util/virerror\.c)$$
 
 exclude_file_name_regexp--sc_prohibit_access_xok = ^src/util/virutil\.c$$
 

diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
index b979a23240540ae6e65776468414927648cfea1a..8b74bf1bb3f3a3671520ddc8b060d081c492d396 100644 (file)
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -26,7 +26,7 @@
 #include "libvirtd-config.h"
 #include "virconf.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "rpc/virnetserver.h"
 #include "configmake.h"

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 7ea968bb589b84c721b0963701b75e17099b362d..fa4d129633bce43f15dd9d9367da88160b3dcae1 100644 (file)
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -33,7 +33,7 @@
 #include <locale.h>
 
 #include "libvirt_internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virfile.h"
 #include "virpidfile.h"
 #include "virprocess.h"

diff --git a/daemon/remote.c b/daemon/remote.c
index 31a8377b130113c16166dfa31fbf3663376b4e94..8767c1884ee68109d4083d9f210cf861319c4a2e 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #if HAVE_POLKIT0
 # include <polkit/polkit.h>

diff --git a/daemon/stream.c b/daemon/stream.c
index f208139ee4fcd4150305e47e4c60250abed4d556..4df1145ce3dc283dcc69a8f13c3a2a1c0b7f28bc 100644 (file)
--- a/daemon/stream.c
+++ b/daemon/stream.c
@@ -28,7 +28,7 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "virnetserverclient.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_STREAMS
 

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 4fea3a0c1f619155e1a7e6eb139129572f8dffe1..cba9d4b58abf18bcf5dd8a0f6167a8215fd2a669 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -239,7 +239,7 @@ $(APIBUILD_STAMP): $(srcdir)/apibuild.py \
                $(srcdir)/../include/libvirt/virterror.h \
                $(srcdir)/../src/libvirt.c \
                $(srcdir)/../src/libvirt-qemu.c \
-               $(srcdir)/../src/util/virterror.c
+               $(srcdir)/../src/util/virerror.c
        $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(APIBUILD)
        touch $@
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 34290e114dcc439b27ea66d435722db9864ae0ec..4d947998bad59f281d6190dd15f2a517f1a2dd41 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -174,8 +174,8 @@ src/util/virsocketaddr.c
 src/util/virstatslinux.c
 src/util/virstoragefile.c
 src/util/virsysinfo.c
-src/util/virterror.c
-src/util/virterror_internal.h
+src/util/virerror.c
+src/util/virerror.h
 src/util/virtime.c
 src/util/virtypedparam.c
 src/util/viruri.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 7ebfabeedbfbde35a8820950fa5ff7ee87538ab4..2713bf29501e01dd227c51275f3502a942d3419b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,7 @@ UTIL_SOURCES =                                                        \
                util/virconf.c util/virconf.h                   \
                util/virdnsmasq.c util/virdnsmasq.h             \
                util/virebtables.c util/virebtables.h           \
+               util/virerror.c util/virerror.h                 \
                util/virevent.c util/virevent.h                 \
                util/vireventpoll.c util/vireventpoll.h         \
                util/virfile.c util/virfile.h                   \
@@ -86,7 +87,6 @@ UTIL_SOURCES =                                                        \
                util/virthreadwin32.h                           \
                util/virthreadpool.c util/virthreadpool.h       \
                util/virtypedparam.c util/virtypedparam.h       \
-               util/virterror.c util/virterror_internal.h      \
                util/vircgroup.c util/vircgroup.h               \
                util/virdbus.c util/virdbus.h                   \
                util/virhash.c util/virhash.h                   \

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index ad9951b402f85752c59ec3821862d20a63252e4f..365c511e11ae533cd03dbbd0a1f15ea2a4f43119 100644 (file)
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -31,7 +31,7 @@
 #include "virutil.h"
 #include "viruuid.h"
 #include "cpu_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 
 #define VIR_FROM_THIS VIR_FROM_CAPABILITIES

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 491a8c795d7e36bdb88a0650bdce5e30af127f66..bdc5f1d17ea6162f59a103dcbbf0c9d19ba41af4 100644 (file)
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virutil.h"
 #include "virbuffer.h"

diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index 45ecb28776ae2cdbddaaceb5df020b9443767d93..099b1cbc4d57ce993469b0d940e7c03ce35f77a2 100644 (file)
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -21,7 +21,7 @@
  */
 
 #include <config.h>
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "viralloc.h"
 #include "virxml.h"

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f979cfcb6dd982beda04f0907a538108aad3e091..79af0871f5f1459833c8c89dda58c20b6ebffaef 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "domain_conf.h"
 #include "snapshot_conf.h"

diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index d5238088e14a339bab3acb4a33983aa409af58ee..96a07ac66788a7a3fde2c9367b2bcece6b672eea 100644 (file)
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -27,7 +27,7 @@
 #include "virlog.h"
 #include "datatypes.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 38672746caecd4824a55ecabce9e9dbaf419180f..9301ec0f61386614fab2abeb41ba1f35ac6c5c7c 100644 (file)
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -22,7 +22,7 @@
  */
 
 #include <config.h>
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 
 #include "interface_conf.h"

diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index e64aeff4c2e601285dedec6b9b22c1203bcacd6f..b830cd00cbf7e151ba4056a8ca7487fc06ff4890 100644 (file)
--- a/src/conf/netdev_bandwidth_conf.c
+++ b/src/conf/netdev_bandwidth_conf.c
@@ -23,7 +23,7 @@
 #include <config.h>
 
 #include "netdev_bandwidth_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 #include "viralloc.h"
 #include "domain_conf.h"

diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c
index 8cee025678d229926278550fcb323e169d042d37..9207184fc17b8b90b6817454390b1d94835054a4 100644 (file)
--- a/src/conf/netdev_vlan_conf.c
+++ b/src/conf/netdev_vlan_conf.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include "netdev_vlan_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c
index a9a38d70230b3b6ffce7c2ead2c67d593edceddb..701e17e07c54de19353f7080999ae06b1c945292 100644 (file)
--- a/src/conf/netdev_vport_profile_conf.c
+++ b/src/conf/netdev_vport_profile_conf.c
@@ -23,7 +23,7 @@
 #include <config.h>
 
 #include "netdev_vport_profile_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 2bd04c510a73b4e0865ed343e2a59d0b33052a3c..f949f79e1fd977e0e14f56517bb884e25af9ba15 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <dirent.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "network_conf.h"
 #include "netdev_vport_profile_conf.h"

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 3c68011b73f4a8441576862bb4e132f6eaed5313..53b6af281447c5f2deaed8d9a8db090b87493494 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "viralloc.h"
 

diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 810de6c8e5f58d34fd77768d35269d6af2f9f399..ca224116348838cde9eccbde077c48261fc9e566 100644 (file)
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -40,7 +40,7 @@
 
 #include "viruuid.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "nwfilter_params.h"
 #include "nwfilter_conf.h"

diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c
index ddad49e62c7d64d28c5e0dbb54ccf006bb8e7e3e..317069dc55f54acb6d4e55b374f10055e042ae9a 100644 (file)
--- a/src/conf/nwfilter_ipaddrmap.c
+++ b/src/conf/nwfilter_ipaddrmap.c
@@ -26,7 +26,7 @@
 
 #include "internal.h"
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "nwfilter_params.h"
 #include "nwfilter_ipaddrmap.h"

diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index 142995297eae3c3bfb3396e5df19a9ed36b90bb0..7aebc8db0aa3dafb2c8f63fe0ea9af02b6c161d8 100644 (file)
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -26,7 +26,7 @@
 #include "internal.h"
 
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "nwfilter_params.h"
 #include "domain_conf.h"

diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 46d2ae51bc893716fcccc4e6e716596c4af17777..891af65b82658e8463dcd6100a2ccf4c0bcfe47c 100644 (file)
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -28,7 +28,7 @@
 #include "virlog.h"
 #include "viralloc.h"
 #include "secret_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 #include "virxml.h"
 #include "viruuid.h"

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index f7f8f63303e0e182373ca9c19d2076d1dd6eb2d1..201c586b2156bf3bf53a280c4939167f2abf071d 100644 (file)
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -45,7 +45,7 @@
 #include "virutil.h"
 #include "viruuid.h"
 #include "virfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virxml.h"
 
 #define VIR_FROM_THIS VIR_FROM_DOMAIN_SNAPSHOT

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 04b25812ab2abd9fff78dc858be6860f3ebae999..7a3999863ff7b6be65ebf7b975c1c4b41f0fae41 100644 (file)
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -33,7 +33,7 @@
 #include <fcntl.h>
 #include <string.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "storage_conf.h"
 #include "virstoragefile.h"

diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c
index 35e9da4ab23c438fbdd61be67182d6aae0929052..88dff1b2104d213b76d1ae762c74154a347ce095 100644 (file)
--- a/src/conf/storage_encryption_conf.c
+++ b/src/conf/storage_encryption_conf.c
@@ -33,7 +33,7 @@
 #include "storage_encryption_conf.h"
 #include "virutil.h"
 #include "virxml.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viruuid.h"
 #include "virfile.h"
 

diff --git a/src/conf/virconsole.c b/src/conf/virconsole.c
index 515c5fa2f23531756113ae14d6308a5180b690a5..239e2d2af50db60ea156b3cea6bc03960246a399 100644 (file)
--- a/src/conf/virconsole.c
+++ b/src/conf/virconsole.c
@@ -35,7 +35,7 @@
 #include "viralloc.h"
 #include "virpidfile.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 5153b626739feab65c70e611bfe09a64809169f0..e279072da69dd3bd7c7b0d35aa3081a6b561484c 100644 (file)
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -24,7 +24,7 @@
 #ifndef __VIR_CPU_H__
 # define __VIR_CPU_H__
 
-# include "virterror_internal.h"
+# include "virerror.h"
 # include "datatypes.h"
 # include "virarch.h"
 # include "conf/cpu_conf.h"

diff --git a/src/datatypes.c b/src/datatypes.c
index 038c47daff21ad67a905417cb2721674f84e5581..068233c616d2cd6e9de63f9ed9064ba52c900ae5 100644 (file)
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 #include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "viralloc.h"
 #include "viruuid.h"

diff --git a/src/esx/esx_private.h b/src/esx/esx_private.h
index de6ba5dcc201b77eb590245a2206df93d1ee7a7b..f1e7adfc6acc8ee519ddd7f15da59ec596b10d35 100644 (file)
--- a/src/esx/esx_private.h
+++ b/src/esx/esx_private.h
@@ -24,7 +24,7 @@
 # define __ESX_PRIVATE_H__
 
 # include "internal.h"
-# include "virterror_internal.h"
+# include "virerror.h"
 # include "capabilities.h"
 # include "esx_vi.h"
 

diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h
index a121d1caa00ef85d974ea2596c531df6f8feb6eb..3eaeb38c00ee3993208c22c291cd49a3bead028f 100644 (file)
--- a/src/esx/esx_vi.h
+++ b/src/esx/esx_vi.h
@@ -29,7 +29,7 @@
 # include <curl/curl.h>
 
 # include "internal.h"
-# include "virterror_internal.h"
+# include "virerror.h"
 # include "datatypes.h"
 # include "esx_vi_types.h"
 # include "esx_util.h"

diff --git a/src/fdstream.c b/src/fdstream.c
index f7f101ecfdc5c1c959f0285d05542ced9d155003..cc2dfe9fac57eefe58f9889b6340cbc0f0b9fd31 100644 (file)
--- a/src/fdstream.c
+++ b/src/fdstream.c
@@ -33,7 +33,7 @@
 #include <netinet/in.h>
 
 #include "fdstream.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "virlog.h"
 #include "viralloc.h"

diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c
index 43ee1fcae955a4b54ba293247b0884a8f146c5f8..943208188be5fedffac4fd53594abd38f829da8a 100644 (file)
--- a/src/hyperv/hyperv_device_monitor.c
+++ b/src/hyperv/hyperv_device_monitor.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "virutil.h"
 #include "viralloc.h"

diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c
index 7dd69120562c87f62960a95b9d2e3af95d1a4c57..b42dbce7ea2a52ea8e34c1f2bfbff0a7881caa25 100644 (file)
--- a/src/hyperv/hyperv_interface_driver.c
+++ b/src/hyperv/hyperv_interface_driver.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "virutil.h"
 #include "viralloc.h"

diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c
index f34a451a8e81db809b6222b3d03b7fb5d08aa102..c75c9430856209a0e43fd21a312117034a7ae92a 100644 (file)
--- a/src/hyperv/hyperv_network_driver.c
+++ b/src/hyperv/hyperv_network_driver.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "virutil.h"
 #include "viralloc.h"

diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c
index c6125ec51dd18820eeb5662c1618201cd0d5e907..faa9074bdadba1651ea6a8071332d15cca1804f8 100644 (file)
--- a/src/hyperv/hyperv_nwfilter_driver.c
+++ b/src/hyperv/hyperv_nwfilter_driver.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "virutil.h"
 #include "viralloc.h"

diff --git a/src/hyperv/hyperv_private.h b/src/hyperv/hyperv_private.h
index 30051ea032edfca6412894dddaea6edfdc8af1c9..9c9fd3eb8ad955fdf4d12e85be259010754fdfa0 100644 (file)
--- a/src/hyperv/hyperv_private.h
+++ b/src/hyperv/hyperv_private.h
@@ -25,7 +25,7 @@
 # define __HYPERV_PRIVATE_H__
 
 # include "internal.h"
-# include "virterror_internal.h"
+# include "virerror.h"
 # include "hyperv_util.h"
 # include "openwsman.h"
 

diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c
index b830e4e6b9f74fd0613c1a5f21e4a1ffcb0ff3a3..602ae9942c6c5ed9c022fdfd12b34e2b99085087 100644 (file)
--- a/src/hyperv/hyperv_secret_driver.c
+++ b/src/hyperv/hyperv_secret_driver.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "virutil.h"
 #include "viralloc.h"

diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c
index 38385a03ba3c59c6d371f2e582f21d7f23df06f2..a169b14887c9084b5d56826383d6beea6e533fe0 100644 (file)
--- a/src/hyperv/hyperv_storage_driver.c
+++ b/src/hyperv/hyperv_storage_driver.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "virutil.h"
 #include "viralloc.h"

diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index e0290288468595b1a4e0c74f228c4f6c20edb9f9..33ba21f58d17edcf9718944f39fa48ac421fd44f 100644 (file)
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -25,7 +25,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "virlog.h"
 #include "viralloc.h"

diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index 74a749b357b55830636241f5bcd3c0205b1132a5..35335c2b8708e73271b8856c4dd2273524b3d3f4 100644 (file)
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -25,7 +25,7 @@
 
 #include <netcf.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "interface_driver.h"
 #include "interface_conf.h"

diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
index 248b02e393bd0289ba863e4ecb9fff9a3053cb41..cc20b98088a1a5a8117416b24795e8a13b0ff3df 100644 (file)
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -23,7 +23,7 @@
 #include <dirent.h>
 #include <libudev.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "interface_driver.h"
 #include "interface_conf.h"

diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c
index 8d53b5c7b74118c7aeee4ce0103419a0cef62683..11da2f350394ee006a2380c3750e2fd235957c5d 100644 (file)
--- a/src/libvirt-qemu.c
+++ b/src/libvirt-qemu.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "datatypes.h"
 #include "libvirt/libvirt-qemu.h"

diff --git a/src/libvirt.c b/src/libvirt.c
index e06b643c28361d32db7f4ce2a7a8df09cf10407b..bf674d1b4b388ba7ee2dff85f62c4d3c71cc6f62 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -45,7 +45,7 @@
 # include <curl/curl.h>
 #endif
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "datatypes.h"
 #include "driver.h"

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 8a1b21e5a3ce19dd7b6a4504ab577182d35903f0..2705e65cf9f462755889c51fa74d9e6ff2820fa0 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -32,7 +32,7 @@
 
 #include "internal.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "virfile.h"
 #include "virstring.h"

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index c62ec3d6e22becf8681ea5be65d201b935e0c021..a956188059618d092226afcbca5b4bd7f1fd11c9 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -32,7 +32,7 @@
 
 #include "internal.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virconf.h"
 #include "datatypes.h"
 #include "virfile.h"

diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c
index 0354e26cdbde0e5b4f3ce4095d5d2de46478d61d..6191e9bab321d0b10e4c5162d2ccd233188985d8 100644 (file)
--- a/src/locking/domain_lock.c
+++ b/src/locking/domain_lock.c
@@ -24,7 +24,7 @@
 #include "domain_lock.h"
 #include "viralloc.h"
 #include "viruuid.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_LOCKING

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index a445b2e5a5d585b3f966be4626085a00cd359aff..7288f7a5bef625678943fabf0cafb4a76eb718ec 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -37,7 +37,7 @@
 #include "virfile.h"
 #include "virpidfile.h"
 #include "virprocess.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "viralloc.h"
 #include "virconf.h"

diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c
index e370dd465c0919b3b6b3fa25ca9e8bab707fd03e..12b06e27e25ade7d081e98998377924bc6b856f6 100644 (file)
--- a/src/locking/lock_daemon_config.c
+++ b/src/locking/lock_daemon_config.c
@@ -26,7 +26,7 @@
 #include "lock_daemon_config.h"
 #include "virconf.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "rpc/virnetserver.h"
 #include "configmake.h"

diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c
index def7c2f16313b08096abc768ea651a51fa972500..45d2cae5307c13e2d12b3590d0d7204d62e17b02 100644 (file)
--- a/src/locking/lock_daemon_dispatch.c
+++ b/src/locking/lock_daemon_dispatch.c
@@ -30,7 +30,7 @@
 #include "lock_daemon.h"
 #include "lock_protocol.h"
 #include "lock_daemon_dispatch_stubs.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 

diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index 9c7ce6d9a4753f64fae7516691724504b5c5d4f7..4b72a05ab2762822ed1012ece0d1284fa81c3b8a 100644 (file)
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -28,7 +28,7 @@
 #include "viruuid.h"
 #include "virutil.h"
 #include "virfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "rpc/virnetclient.h"
 #include "lock_protocol.h"
 #include "configmake.h"

diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index 511543aaedfcb6b83469c86356be0a8d0e973143..75ced845c2612d1f254bb4307ae38464be972ac8 100644 (file)
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -38,7 +38,7 @@
 #include "dirname.h"
 #include "lock_driver.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virutil.h"
 #include "virfile.h"

diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index 1b888389c491ef10ffbd39fe8e7ec712b6ab8ea8..ae60caf1c0fa06f29e538b2d87400709dbf9a0e1 100644 (file)
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -23,7 +23,7 @@
 
 #include "lock_manager.h"
 #include "lock_driver_nop.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virutil.h"
 #include "viralloc.h"

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 74f31566539f69ff6421521ef1beb07fa5822be8..1984c5f8e51bc9f390828335f0e7fec859a99e61 100644 (file)
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -24,7 +24,7 @@
 #include "lxc_cgroup.h"
 #include "lxc_container.h"
 #include "virfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "viralloc.h"
 #include "vircgroup.h"

diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index 866718caba5e5d87769709b633d4ae080d08435a..90f5680108dc53d56340220e7727717ea79b7d77 100644 (file)
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -28,7 +28,7 @@
 
 #include "lxc_conf.h"
 #include "nodeinfo.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virconf.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 6769d335b3a830b7cd829cf5047f51c0f8dab29a..d3a2968d3bb84df41673a924f7b08b92c15d6df0 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -53,7 +53,7 @@
 # include <blkid/blkid.h>
 #endif
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "lxc_container.h"
 #include "virutil.h"

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 123db3c33d86180e87ec4039f8faf492c719c35b..c9d96b34e760ccb79ebc4f0175b7ea3b3acde644 100644 (file)
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -51,7 +51,7 @@
 # include <numa.h>
 #endif
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virutil.h"
 

diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index fab150630d833d42aada1dc3147493ee824755ab..1b02aa5353158e86f608533827b07435e2bf0f5d 100644 (file)
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -25,7 +25,7 @@
 
 #include "viralloc.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 91d09c455c3e777d855312652f2801aac36faa4f..8050ce633aa80d9327530da3c9835164457e1b19 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <wait.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "datatypes.h"
 #include "lxc_cgroup.h"

diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index 485456ef368b0cad447b47d0cbd802b9e8997584..fdba04215617e68aebdade7e4850bc2a852fed54 100644 (file)
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -31,7 +31,7 @@
 
 #include "lxc_fuse.h"
 #include "lxc_cgroup.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virfile.h"
 #include "virbuffer.h"

diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c
index f01fc5630c242bce4eeb1e45fdf577af059d1861..21f3096986949be99deb6d836d826bb7cf5be92c 100644 (file)
--- a/src/lxc/lxc_hostdev.c
+++ b/src/lxc/lxc_hostdev.c
@@ -26,7 +26,7 @@
 #include "lxc_hostdev.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 

diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index b0da21fd5ae6e664492fffc54acf6eddddf00b7e..65194a5ea71f843aa15bf44a84c5fc292b0ad07d 100644 (file)
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -27,7 +27,7 @@
 
 #include "viralloc.h"
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virthread.h"
 #include "rpc/virnetclient.h"

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 00bc1c62beea54ec132e77c91637eeed436846a2..1a89e4ae7963d914f30c9f7b392036393b7a80f7 100644 (file)
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -40,7 +40,7 @@
 #include "network/bridge_driver.h"
 #include "viralloc.h"
 #include "domain_audit.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "vircommand.h"
 #include "lxc_hostdev.h"

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 4bf8a2bfea1cdcfcb8540e2461cb5597f41c710b..660c38dac7cd14a4fac6a67ca156285106f99413 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -44,7 +44,7 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "bridge_driver.h"
 #include "network_conf.h"

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 6cc18373a678582c83a6ec8db684494614d0d125..522af990e812077e57982207a0c09936c1544fb3 100644 (file)
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -30,7 +30,7 @@
 #include <time.h>
 #include <sys/stat.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 8ee816b0419241a62416c8d740745d1f541fb969..610df8d5b71998f3e9294a65a32889e836e8a761 100644 (file)
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -30,7 +30,7 @@
 
 #include "node_device_conf.h"
 #include "node_device_hal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "driver.h"
 #include "datatypes.h"
 #include "viralloc.h"

diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c
index be5d3ed9f185870a327652a6c54dc56a706a2692..9c305d3b355efb8820bef7b88d895bd301540c6a 100644 (file)
--- a/src/node_device/node_device_linux_sysfs.c
+++ b/src/node_device/node_device_linux_sysfs.c
@@ -28,7 +28,7 @@
 
 #include "node_device_driver.h"
 #include "node_device_hal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 61e5a0e2ff12bf555fee2ecb1bece9a7ed07a09a..a9b30b20967469aa61f3d67aa7c2a77c1eda0377 100644 (file)
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -27,7 +27,7 @@
 #include <c-ctype.h>
 
 #include "node_device_udev.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "node_device_conf.h"
 #include "node_device_driver.h"
 #include "driver.h"

diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 337e6849f3c55b4b32fc6395f43b9e29db11d143..57a931b0597036cc15985dd23e53147d041554a0 100644 (file)
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -49,7 +49,7 @@
 #include "physmem.h"
 #include "virutil.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "count-one-bits.h"
 #include "intprops.h"
 #include "virarch.h"

diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index c1ab6227ca84eed0b39b4b37dac15cb73aaa239f..90b5615a8050fdc57fad3ab72b715e5dab983b1e 100644 (file)
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -57,7 +57,7 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "conf/domain_conf.h"
 #include "nwfilter_gentech_driver.h"
 #include "nwfilter_dhcpsnoop.h"

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 4b1188db288bcfb029d98d22d3054a78e444bafb..1ac91cf00f3a27d8ba1e18b3ddeffdd61ca15c29 100644 (file)
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -32,7 +32,7 @@
 
 #include "internal.h"
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "viralloc.h"
 #include "domain_conf.h"

diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
index 092ae5a15d20846e5caa6d8b9e71718c326bf6a3..4fec52dd2c5bc53cb20cfd9c3af0f6a91bce34c2 100644 (file)
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -33,7 +33,7 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "domain_conf.h"
 #include "nwfilter_conf.h"
 #include "nwfilter_driver.h"

diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c
index 2b4cc8e3192230526003d5fbaaede93e2c7d9a2b..086bb13c561ee1ffb03e8fc2f880994ff2d67b4b 100644 (file)
--- a/src/nwfilter/nwfilter_gentech_driver.c
+++ b/src/nwfilter/nwfilter_gentech_driver.c
@@ -29,7 +29,7 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "domain_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "nwfilter_gentech_driver.h"
 #include "nwfilter_ebiptables_driver.h"
 #include "nwfilter_dhcpsnoop.h"

diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index 442cc83c663022a3489e32c0b946a01cd17fa0b2..7a4f98389186ac66d1316f0e2f9cb7741f75dd70 100644 (file)
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -46,7 +46,7 @@
 #include "virlog.h"
 #include "datatypes.h"
 #include "virnetdev.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virthread.h"
 #include "conf/nwfilter_params.h"
 #include "conf/domain_conf.h"

diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index b5a5c87134685aeebc7bffd688e1cee65fbad4ba..09518d52fabb146563856f4a231e4a35118117cd 100644 (file)
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -42,7 +42,7 @@
 #include <string.h>
 #include <sys/wait.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "openvz_conf.h"
 #include "openvz_util.h"
 #include "viruuid.h"

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index ca0e927868c071f8898e1a36667362968e124536..c6f814e065480f6cac79c61be485731e7e0c2cd2 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -44,7 +44,7 @@
 #include <stdio.h>
 #include <sys/wait.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "openvz_driver.h"
 #include "openvz_util.h"

diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c
index 51b22c9492ad8c20db8249af76177cb3196ca0ff..dc69df2cb4f8da398d91b42b0d9744213428db39 100644 (file)
--- a/src/openvz/openvz_util.c
+++ b/src/openvz/openvz_util.c
@@ -25,7 +25,7 @@
 
 #include "internal.h"
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "vircommand.h"
 #include "datatypes.h"
 #include "viralloc.h"

diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index 75cce6806354eafef2ed15ae430c9b92ce566830..6f33080f86ee66ad22f67fb71893fd2a59549ca6 100644 (file)
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -41,7 +41,7 @@
 #include <sys/statvfs.h>
 
 #include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virutil.h"
 #include "virlog.h"

diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c
index 4729f187dfa26433e7f51218466ac4bd9d5fdf48..c5ece79657c2c086857b281cb1f6761e8f81e54d 100644 (file)
--- a/src/parallels/parallels_network.c
+++ b/src/parallels/parallels_network.c
@@ -24,7 +24,7 @@
 
 #include "datatypes.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "md5.h"
 
 #include "parallels_utils.h"

diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c
index 0e6c1007acf2710670c5dda34fabb02f370eef29..e768d881f825e8ba90d5e57895a16e7f42b13dc9 100644 (file)
--- a/src/parallels/parallels_storage.c
+++ b/src/parallels/parallels_storage.c
@@ -34,7 +34,7 @@
 #include "viralloc.h"
 #include "configmake.h"
 #include "virstoragefile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #include "parallels_utils.h"
 

diff --git a/src/parallels/parallels_utils.c b/src/parallels/parallels_utils.c
index 9e317b11920d61cb16d8a1a40e50a90c2019d958..dd2f0b77ad6bbda66a4a8c503181dd098d1559bf 100644 (file)
--- a/src/parallels/parallels_utils.c
+++ b/src/parallels/parallels_utils.c
@@ -25,7 +25,7 @@
 #include <stdarg.h>
 
 #include "vircommand.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virjson.h"
 

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index df15253fed0eb2f8320c5a597e7aabc749a4f070..8e26b0cae505e0c049e0a66a0b92866bc63b7efa 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -51,7 +51,7 @@
 #include "virlog.h"
 #include "driver.h"
 #include "libvirt/libvirt.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viruuid.h"
 #include "domain_conf.h"
 #include "storage_conf.h"

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index ec1e3002e06ac5dd4365f06b73f80be597eeba04..bb421bd903134ec91384094527362bdf2ba4874b 100644 (file)
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -36,7 +36,7 @@
 #include "qemu_command.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virjson.h"
 #include "virfile.h"
 #include "virprocess.h"

diff --git a/src/qemu/qemu_bridge_filter.c b/src/qemu/qemu_bridge_filter.c
index 6d84f4711080773f84c0fa133f3c7f3011225ebd..3bc1141a4d00a202c89ab82b3f23f2915574f423 100644 (file)
--- a/src/qemu/qemu_bridge_filter.c
+++ b/src/qemu/qemu_bridge_filter.c
@@ -26,7 +26,7 @@
 #include "qemu_conf.h"
 #include "qemu_driver.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 
 #include "qemu_bridge_filter.h"

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 8f1678b49768d3de080914955984cf707d6cfb26..167cdb29f82de965f9aeab4af51c305e6fc159c4 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -26,7 +26,7 @@
 #include "qemu_capabilities.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 #include "virfile.h"
 #include "virpidfile.h"

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index a2ea5c6438335227bb4834a54be92c5e36166b5c..7faf0251e3d18f61ca50afbf3172b444c9ca3b1c 100644 (file)
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -29,7 +29,7 @@
 #include "vircgroup.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 #include "domain_audit.h"
 

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 836834470f058761f30e554e9a3c29648efc38a1..8a3de09ae5c26db897a19ccadbe7d84782d4d37b 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -30,8 +30,8 @@
 #include "cpu/cpu.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "virterror_internal.h"
 #include "virarch.h"
+#include "virerror.h"
 #include "virutil.h"
 #include "virfile.h"
 #include "viruuid.h"

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index ed18ac6eeae00dc20e2fe16c3cbbbd70cc8a360a..c6deb10f540a182f2eaefc68ff54a80962b1fe55 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -34,7 +34,7 @@
 #include <sys/wait.h>
 #include <arpa/inet.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "qemu_conf.h"
 #include "qemu_command.h"
 #include "qemu_capabilities.h"

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 46b765606cdccffdff6674030068fa3ef0417c30..5d11f831317ae123f37a674502fdaca451c175bd 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -29,7 +29,7 @@
 #include "qemu_migration.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "c-ctype.h"
 #include "cpu/cpu.h"
 #include "viruuid.h"

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 5b9fcf7f0ce9f4eacb0eeb29d783cf28a72c3d73..0058c8d72d47e9537dcff244d2fa24f09feb4d84 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -58,7 +58,7 @@
 #include "qemu_process.h"
 #include "qemu_migration.h"
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "datatypes.h"
 #include "virbuffer.h"

diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 307f3e0c64d5ac0ae06156abd892c6f774d92207..174d125de9fc998714dceab16b3c500c7b90fc1a 100644 (file)
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -25,7 +25,7 @@
 
 #include "qemu_hostdev.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virpci.h"
 #include "virusb.h"

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index b54dce1502cbdb11f87df2871dee648c023104f1..19172e1255e99629fe8c35b48912eea0c527cd15 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -34,7 +34,7 @@
 #include "domain_nwfilter.h"
 #include "virlog.h"
 #include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virpci.h"
 #include "virfile.h"

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 6cd16e7189ce852d3ed1cf206d05227a138f0802..9c7247bf7646ad0a86cde5830417eb5602a0a8be 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -37,7 +37,7 @@
 
 #include "domain_audit.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virutil.h"
 #include "virfile.h"

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 5ca1f899945f12e2fd99a2f069aeaa0d7cde9346..99642b647cbc509ca16aa38abd9935e119e8c0dc 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -31,7 +31,7 @@
 #include "qemu_monitor.h"
 #include "qemu_monitor_text.h"
 #include "qemu_monitor_json.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 0137291dddf0f1d176f72be80cbab4dcbc155c10..2d2d254eed1f881ddc17f3eff6cf6350d470886d 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -39,7 +39,7 @@
 #include "virlog.h"
 #include "driver.h"
 #include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virjson.h"
 
 #ifdef WITH_DTRACE_PROBES

diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 82e9108d8aefa299919e29a39ee4f5e215255bc2..6506f9da1b437128659222ce1955d7da06d45388 100644 (file)
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -38,7 +38,7 @@
 #include "virlog.h"
 #include "driver.h"
 #include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virbuffer.h"
 
 #ifdef WITH_DTRACE_PROBES

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 2dd2416f4c0f1dfe94cd5e156660480ee214cd43..eac6553bc872d14b90c149cc269092aaeb1865a5 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -52,7 +52,7 @@
 
 #include "datatypes.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virhook.h"
 #include "virfile.h"

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index ac7dc872358e9ecfbafdf7330003aef2119de34d..ae861cca40cd5a341d4acc851561db54fd80d8c1 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -29,7 +29,7 @@
 #include "virnetclient.h"
 #include "virnetclientprogram.h"
 #include "virnetclientstream.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "datatypes.h"
 #include "domain_event.h"

diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index 18be350a992bb6577ae6e802d6f73e9b34b6c695..a8ceff52fa2bfc33486a4aa6739a3fd5b152dfc3 100644 (file)
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -27,7 +27,7 @@
 #include "virfile.h"
 #include "virlog.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virnetsocket.h"
 #include "virkeepaliveprotocol.h"
 #include "virkeepalive.h"

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 9347f0b45c45688e87b0ed417b69bbbd94e942a4..208e2e951e2c30511ad3ef6127647d8cb0715450 100644 (file)
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -35,7 +35,7 @@
 #include "virfile.h"
 #include "virlog.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 

diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index eff4a4c09d624bce9d67196fb6f86c171ea4eefe..a179b8df7a5876bc02b3c5058f9321351367835e 100644 (file)
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -29,7 +29,7 @@
 #include "virnetprotocol.h"
 
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virutil.h"
 #include "virfile.h"

diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 7e1f9c716bfa5ed0ec17669222416fbabbc13c2d..15ed91aac8fc912c8b54b6bc837d2f8585523205 100644 (file)
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -25,7 +25,7 @@
 #include "virnetclientstream.h"
 #include "virnetclient.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virthread.h"
 

diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index b2da65bbee47d28834a1d1d41c9cf7adff2cc724..b7330de59350cee38a5a7a90be190cf89de93e69 100644 (file)
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -25,7 +25,7 @@
 
 #include "virnetmessage.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virfile.h"
 #include "virutil.h"

diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c
index cd30f4df20cb41c585cdeca524cc5074231b1d3a..cbf7261a2f65d6ffc80f522c245cd4a8ccf2831e 100644 (file)
--- a/src/rpc/virnetsaslcontext.c
+++ b/src/rpc/virnetsaslcontext.c
@@ -25,7 +25,7 @@
 #include "virnetsaslcontext.h"
 #include "virnetmessage.h"
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virthread.h"
 #include "virlog.h"

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 47a629302b2ae5c1877514424e41b15a064f2b72..5674309873dbaa50246cae06ad6b7ac70c713138 100644 (file)
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -30,7 +30,7 @@
 #include "virnetserver.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virthread.h"
 #include "virthreadpool.h"
 #include "virutil.h"

diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index f1eb69b38324d374f90079e3cfef7c04f9d8ec2e..aefc5116f6ea1cf0df1ea6e6d14ec274749c79a8 100644 (file)
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -30,7 +30,7 @@
 #include "virnetserverclient.h"
 
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virthread.h"
 #include "virkeepalive.h"

diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c
index daef2b4a2f42f939ac731a62078a3c53050e6f15..b6f8e8e6c06062779a3572dc03fb4234d647fb61 100644 (file)
--- a/src/rpc/virnetservermdns.c
+++ b/src/rpc/virnetservermdns.c
@@ -43,7 +43,7 @@
 #include "virnetservermdns.h"
 #include "vireventpoll.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC

diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index a8f875c3e2a57310a898eeab023ef8e863b65a6c..3ac38092ffee57087aa47b720b06a59f273b7e01 100644 (file)
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -27,7 +27,7 @@
 #include "virnetserverclient.h"
 
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virfile.h"
 #include "virthread.h"

diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index 9992983cac02f738fa493761cab353dc653dfbfe..7d671f0ce865f21446bdb1b409cea9bd2b7acd7a 100644 (file)
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -26,7 +26,7 @@
 #include "virnetserverservice.h"
 
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virthread.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index a959c30c02f24cc16042b4b4073b54fb1ac4a2b0..ef938924d7528aa495d4f973f6f6040275464d8b 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -43,7 +43,7 @@
 #include "virnetsocket.h"
 #include "virutil.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virfile.h"
 #include "virthread.h"

diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index ad8bd48db9718b327da6f2dc6332054f9f9e1f61..661860f13f047d17b48d4808ff6c8e8967e3fb53 100644 (file)
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -32,7 +32,7 @@
 #include "configmake.h"
 #include "virthread.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virobject.h"
 
 #define VIR_FROM_THIS VIR_FROM_SSH

diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index b01de8c3fed96ee442de834547b10fc1af6fc085..56e372b3b5b49e14c3157788990e31ebdeb93215 100644 (file)
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -31,7 +31,7 @@
 #include "virnettlscontext.h"
 
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 #include "virlog.h"
 #include "virthread.h"

diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index 1784feaf20455ce6c912a26507b938a0bbacd12f..5be33b9cb14cf93035866a89fc073474def76a63 100644 (file)
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -39,7 +39,7 @@
 #include "virthread.h"
 #include "virutil.h"
 #include "viruuid.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virfile.h"
 #include "configmake.h"
 

diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 3eb1e6583ccb9165816aa47752c061ddd3c105f7..7331c91f8a03b17f7191da0d01e0e497c32e7fbe 100644 (file)
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -40,7 +40,7 @@
 #include "security_apparmor.h"
 #include "virutil.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "viruuid.h"
 #include "virpci.h"

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 5da4e73223389d96f0debbecba765005cfbe30a9..deff024c40966156ec78a802417a2fba6d1a4615 100644 (file)
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -24,7 +24,7 @@
 #include <fcntl.h>
 
 #include "security_dac.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/src/security/security_driver.c b/src/security/security_driver.c
index 82d3ca9cb5908f53c06f3cc32f2ba468303f931b..319b86f40068c23c1796f76dbcaf9c5efcc7e2b9 100644 (file)
--- a/src/security/security_driver.c
+++ b/src/security/security_driver.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #include <string.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 
 #include "security_driver.h"

diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index d6a3f644740350bff86505be1f66c91e9ae9b4b5..593c00bf561be445c67ac71c938bfaa36100cd82 100644 (file)
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -26,7 +26,7 @@
 #include "security_driver.h"
 #include "security_stack.h"
 #include "security_dac.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 

diff --git a/src/security/security_nop.c b/src/security/security_nop.c
index 7bc8bba8c30fe6771fb0bee8a6ccfbec56f26818..b6eb3f696f39846a849555a6d77f53cc65562021 100644 (file)
--- a/src/security/security_nop.c
+++ b/src/security/security_nop.c
@@ -21,7 +21,7 @@
 
 #include "security_nop.h"
 
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECURITY
 

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 947fb34513315b187c51237030f072e72b4a1423..b5e1a9a1d92cc2cf964cd6bdb689b4ba1a7c53ae 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -33,7 +33,7 @@
 
 #include "security_driver.h"
 #include "security_selinux.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/src/security/security_stack.c b/src/security/security_stack.c
index 341237204a28a38da7485ead44c020fe76cbf8f3..8e1e5f9a4f6842622e19f7bf9b49e089d5799097 100644 (file)
--- a/src/security/security_stack.c
+++ b/src/security/security_stack.c
@@ -22,7 +22,7 @@
 
 #include "security_stack.h"
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECURITY

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index f98a7c0e62a0bca332c78c41124cdbe238387d69..df79b28dbeb9eea1dbe17e7c5f4072561a032769 100644 (file)
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -46,7 +46,7 @@
 #endif
 
 #include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 #include "viralloc.h"
 #include "internal.h"

diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index aceb82bd31ce1e6bec778d7519ce3e63c630cf83..4214e976c5eaa2257df1ac683990960e56ef9b09 100644 (file)
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <stdio.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "storage_backend_disk.h"
 #include "virutil.h"

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 23fa0f5b963c40556b6a7b8419355a65309631fb..2205371db7c485b7166d4326a053bdea89d74127 100644 (file)
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -41,7 +41,7 @@
 # include <blkid/blkid.h>
 #endif
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "storage_backend_fs.h"
 #include "storage_conf.h"
 #include "virstoragefile.h"

diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index e91c4b15518027bd535a2407d5b79b815dd7c3b6..f374961a4cfa2ee2c4889bc3fabc195d6480b513 100644 (file)
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "storage_backend_scsi.h"
 #include "storage_backend_iscsi.h"
 #include "virutil.h"

diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
index 83b517cde466af772e39037d07cfdc132bf202da..273468926b4eba5608bc229acf2f1a85f29a7eee 100644 (file)
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "storage_backend_logical.h"
 #include "storage_conf.h"
 #include "vircommand.h"

diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c
index 0e5d0329e5950568b208ea6cbb806eedc0fdd3a1..b12b81f0d10f104442059bc6b9b633389512374b 100644 (file)
--- a/src/storage/storage_backend_mpath.c
+++ b/src/storage/storage_backend_mpath.c
@@ -29,7 +29,7 @@
 
 #include <libdevmapper.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "storage_conf.h"
 #include "storage_backend.h"
 #include "viralloc.h"

diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 7dc46b0052021b1b7accd784a457c46b40778caf..f5c6b0f1b4a8885bc631fccaf387e4a4219dd15c 100644 (file)
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "storage_backend_rbd.h"
 #include "storage_conf.h"
 #include "virutil.h"

diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index 1db8fdd6b35771b46277568d7f733637b2096b95..1a03c49ed0c721931a9bf2281f639aea1b36b6c1 100644 (file)
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -28,7 +28,7 @@
 #include <dirent.h>
 #include <fcntl.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "storage_backend_scsi.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c
index 1046ac9710444b948e7fec345c80224cf293df41..cd18f331373d500039c5dc5e82ee308b37eeb868 100644 (file)
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -26,7 +26,7 @@
 
 #include <config.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "storage_backend_sheepdog.h"
 #include "storage_conf.h"
 #include "vircommand.h"

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index d93617c489f04e8f934aa12dfd630ba23d1f00d7..ff56f4f903b7c93a74a0f0bebcd27fd7c7c937b8 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -36,7 +36,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "driver.h"
 #include "virutil.h"

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 4716e41fceaf05d0380d504c3a427cb1eb686aab..3e082a423d0a4e0f7a3e7fb94701eb445665904e 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -32,7 +32,7 @@
 #include <libxml/xmlsave.h>
 
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "test_driver.h"
 #include "virbuffer.h"

diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h
index dfa168ed4c913e7f116b6f5a2e6882e71d69936e..a4e264ffd199d3d5ea6cdb4decbbf94466e29dab 100644 (file)
--- a/src/uml/uml_conf.h
+++ b/src/uml/uml_conf.h
@@ -29,7 +29,7 @@
 # include "network_conf.h"
 # include "domain_conf.h"
 # include "domain_event.h"
-# include "virterror_internal.h"
+# include "virerror.h"
 # include "virthread.h"
 # include "vircommand.h"
 # include "virhash.h"

diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index 40b04f9000a87b0a4ef7cd9499f7ad31a3e01f4f..2230bcbbd438df19912d07a57ded6f9971cd44ed 100644 (file)
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -37,7 +37,7 @@
 #include "virthread.h"
 #include "virfile.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "configmake.h"
 #include "virrandom.h"
 

diff --git a/src/util/viraudit.c b/src/util/viraudit.c
index 05189d5ff758e6fea85053a6f8feba9d4a29f46a..04ac323e296c37981265068e7135e4836d762014 100644 (file)
--- a/src/util/viraudit.c
+++ b/src/util/viraudit.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "viraudit.h"
 #include "virutil.h"

diff --git a/src/util/virauth.c b/src/util/virauth.c
index cbb16ec26322bc78d034ee8e86790fa24d735236..c26e340ddd9826434edd052671d4c24813a2e29e 100644 (file)
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -29,7 +29,7 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "configmake.h"
 #include "virauthconfig.h"
 

diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
index d60f7bff9e5b38678100a1f218c5c2307b755dde..1d1f084ae23273ab929cdb59420c369d6ee8b9c4 100644 (file)
--- a/src/util/virauthconfig.c
+++ b/src/util/virauthconfig.c
@@ -28,7 +28,7 @@
 #include "viralloc.h"
 #include "virutil.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 
 struct _virAuthConfig {

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index d059586380c8989602dc711a184c68e7f8da707c..c906f2a09d378c030762047ed030a2b34058da94 100644 (file)
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -35,7 +35,7 @@
 
 #include "vircommand.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/src/util/virconf.c b/src/util/virconf.c
index aaeb32e24b53fb0188a73f1f06a4e8e772ff31ea..16f074a05e0ea571ec78a28e75d19bedc47f8b94 100644 (file)
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virbuffer.h"
 #include "virconf.h"
 #include "virutil.h"

diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index f45074ca258fa72073875eb4b3211c05c1b2de87..127e57f2514184549bf19f644512bdf8006526ab 100644 (file)
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -23,7 +23,7 @@
 
 #include "virdbus.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virthread.h"
 

diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 404e3b9212cadf20c27e0a9355b858bebed0cc03..2d0f02ce3a602d3b2084b0b7b96894b2d45125d2 100644 (file)
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -46,7 +46,7 @@
 #include "virutil.h"
 #include "vircommand.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virfile.h"
 

diff --git a/src/util/virebtables.c b/src/util/virebtables.c
index 68eb79626bb0be31f890ad0cb781fecc4b8f2a62..ded62d7ce4f0e1341032310bf47e2d4d23d868d9 100644 (file)
--- a/src/util/virebtables.c
+++ b/src/util/virebtables.c
@@ -45,7 +45,7 @@
 #include "virebtables.h"
 #include "vircommand.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virthread.h"
 

diff --git a/src/util/virterror.c b/src/util/virerror.c
similarity index 99%
rename from src/util/virterror.c
rename to src/util/virerror.c
index a5867386dc2b1841ac4b9f38c455b17851f18301..500c32bcb3c94e7f127e403e7b0cda2db10297b6 100644 (file)
--- a/src/util/virterror.c
+++ b/src/util/virerror.c
@@ -1,5 +1,5 @@
 /*
- * virterror.c: implements error handling and reporting code for libvirt
+ * virerror.c: error handling and reporting code for libvirt
  *
  * Copyright (C) 2006, 2008-2012 Red Hat, Inc.
  *
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "virlog.h"
 #include "viralloc.h"

diff --git a/src/util/virterror_internal.h b/src/util/virerror.h
similarity index 99%
rename from src/util/virterror_internal.h
rename to src/util/virerror.h
index 961c42359bad04195fbb3ec5f621007a6bbf01cf..332a5eb4fa06359ca6882e4f8486e0fdabbf0926 100644 (file)
--- a/src/util/virterror_internal.h
+++ b/src/util/virerror.h
@@ -1,5 +1,5 @@
 /*
- * virterror.h: internal error handling
+ * virerror.c: error handling and reporting code for libvirt
  *
  * Copyright (C) 2006-2009, 2011 Red Hat, Inc.
  *

diff --git a/src/util/virevent.c b/src/util/virevent.c
index e45f96e9612b8faf6bd652119bf12d9c915c9202..6900011c030271539d1dfda1b33a45e00fd0f12d 100644 (file)
--- a/src/util/virevent.c
+++ b/src/util/virevent.c
@@ -26,7 +26,7 @@
 #include "virevent.h"
 #include "vireventpoll.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #include <stdlib.h>
 

diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c
index a0b32ad85c35c9e8813aab0e98b1d43d17fedc4d..5c6d31bc4e3216f2d1bb9239f8aa6f1044c07231 100644 (file)
--- a/src/util/vireventpoll.c
+++ b/src/util/vireventpoll.c
@@ -37,7 +37,7 @@
 #include "viralloc.h"
 #include "virutil.h"
 #include "virfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virtime.h"
 
 #define EVENT_DEBUG(fmt, ...) VIR_DEBUG(fmt, __VA_ARGS__)

diff --git a/src/util/virfile.c b/src/util/virfile.c
index f20ce64a517a70df2cdf2867d6c9b1892cede3fc..50999aa0d34db90e552247a35d049bfb6769a1fe 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -40,7 +40,7 @@
 #include "vircommand.h"
 #include "configmake.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/util/virhash.c b/src/util/virhash.c
index a1234c4baea6bee0a26bc80e255c5b7cddd57a8f..2fe8751dcdcd7bb94f77ea40f68e2954c00896f6 100644 (file)
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virhash.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/src/util/virhook.c b/src/util/virhook.c
index c3109b0786a2f5afc434a839f3c3ca26db24dd81..097afba93675d424bd574c9583c17bb7ed16ea07 100644 (file)
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virhook.h"
 #include "virutil.h"
 #include "virlog.h"

diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c
index f8ac673a8eabfa19fd223646628804ae98e32d2b..1618ffa978e0b5a85cad63249f83fc4746bd20e2 100644 (file)
--- a/src/util/virinitctl.c
+++ b/src/util/virinitctl.c
@@ -28,7 +28,7 @@
 
 #include "internal.h"
 #include "virinitctl.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 #include "viralloc.h"
 #include "virfile.h"

diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index b873acfe5905e470488d58107f2b0c78bcca0fd5..2c4290a0d601875d14cbae44be91bca348b4b448 100644 (file)
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -43,7 +43,7 @@
 #include "viriptables.h"
 #include "vircommand.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virthread.h"
 

diff --git a/src/util/virjson.c b/src/util/virjson.c
index e92e3d4224068faaf73ad073aa3f453e8f0c1734..db5eda269cc01f6420ec96a0933eae62310329b0 100644 (file)
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -25,7 +25,7 @@
 
 #include "virjson.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virutil.h"
 

diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c
index 99e5cd7bab33f14cef9cc701051784871f0bd006..d77e95d79cac83bb643f9df3e2e71bcfe33eae96 100644 (file)
--- a/src/util/virkeyfile.c
+++ b/src/util/virkeyfile.c
@@ -31,7 +31,7 @@
 #include "virutil.h"
 #include "virhash.h"
 #include "virkeyfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_CONF
 

diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 81a1d81688d05bc282db08ca2a1b1d5d04f73443..9ada6a6441602d820d85be36594d765b449da6a3 100644 (file)
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -24,7 +24,7 @@
 #include "virlockspace.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 #include "virfile.h"
 #include "virhash.h"

diff --git a/src/util/virlog.c b/src/util/virlog.c
index c29d4ef9c5db1c6518f5a54a87633af3637f0865..acd42c1b0ac1a34bf62fd7c7242c9c6d5a938a10 100644 (file)
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -40,7 +40,7 @@
 # include <sys/un.h>
 #endif
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "viralloc.h"
 #include "virutil.h"

diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 447954a44ac6746f10545e7a4deddbe02ee83e64..e5a0d6d197931f8dc6db1480f0980d3ab8b3d406 100644 (file)
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -25,7 +25,7 @@
 #include "virnetdev.h"
 #include "virmacaddr.h"
 #include "virfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "vircommand.h"
 #include "viralloc.h"
 #include "virpci.h"

diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index 9cc885849cf65c93f08d84c5366468a4e1604319..2c5b63a0d29f9d607a1c9c80fef1aacdf7db7415 100644 (file)
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -25,7 +25,7 @@
 #include "virnetdevbandwidth.h"
 #include "vircommand.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index 4de88e3566227263c0a260fde5ae5f760eb5a293..b87c6019846756937b2ce8f56f8d13075b3ef30e 100644 (file)
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -23,7 +23,7 @@
 #include <config.h>
 
 #include "virnetdevbridge.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 #include "virfile.h"
 #include "viralloc.h"

diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 720a48a288200f466c5b44335dc5f5838e6b6ce7..a74db1ebef3f5c23c2295852b40c5ffc3e971ab0 100644 (file)
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -30,7 +30,7 @@
 #include "virnetdevmacvlan.h"
 #include "virmacaddr.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_NET
 

diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index b876a4e6152a7cd0fd39d4376313bac776bab466..47c3db8fb15de605c948c63a7dacb87f9e09b0bd 100644 (file)
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -26,7 +26,7 @@
 #include "virnetdevopenvswitch.h"
 #include "vircommand.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virmacaddr.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index 3565bbde64d9e1c7eddf97d4f1f401771d741ce4..a884de1ae8c26f5a5f957aaed918d195deeed179 100644 (file)
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -27,9 +27,9 @@
 #include "virnetdev.h"
 #include "virnetdevbridge.h"
 #include "virnetdevopenvswitch.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "virutil.h"

diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index c6568b73c27ee6d0036c0316f5a7eb1b9afbab63..3f81655e4004578ba2764b538f804d34f2af5620 100644 (file)
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -29,7 +29,7 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "vircommand.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c
index 53c6b6500933970d735d8c9f89deabfa9652167d..2fe2017b580723ca198ba8a837d820ec0244b8bd 100644 (file)
--- a/src/util/virnetdevvlan.c
+++ b/src/util/virnetdevvlan.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virnetdevvlan.h"
 #include "viralloc.h"
 

diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index 60acabd5584da66f07a5fceafab7c4382e5440c6..bb97e3a847b8b9831ac866e6e20e43e1b347dd2a 100644 (file)
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -23,7 +23,7 @@
 #include <config.h>
 
 #include "virnetdevvportprofile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NET

diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index fdd4c0d33a5c6bf15c10f2793f5f36600588ca86..0b36fdcff121e43d57f965dbefc31ab63061be0c 100644 (file)
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -40,7 +40,7 @@
 #include "viralloc.h"
 #include "virthread.h"
 #include "virmacaddr.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #ifndef SOL_NETLINK
 # define SOL_NETLINK 270

diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c
index 878be1d9866b19811414433336cefe71225f7149..df40ccd4d413faa349018155895a1e3a24bbb97c 100644 (file)
--- a/src/util/virnodesuspend.c
+++ b/src/util/virnodesuspend.c
@@ -28,7 +28,7 @@
 
 #include "viralloc.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/virobject.c b/src/util/virobject.c
index aca61823297730026f78da3e51e87c91d1789997..f51b73570e39f82114d4612461781bc21f224902 100644 (file)
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -25,7 +25,7 @@
 #include "virthread.h"
 #include "viralloc.h"
 #include "viratomic.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/util/virpci.c b/src/util/virpci.c
index 1faed605406169b74e586fb418f64aa2ff95607d..4b26452d20aee3edd949f0e5ea58e990c1bc045e 100644 (file)
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -39,7 +39,7 @@
 #include "virlog.h"
 #include "viralloc.h"
 #include "vircommand.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virfile.h"
 
 #define PCI_SYSFS "/sys/bus/pci/"

diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
index 29097e36229504999794e0b7238a8ba464889e01..14c9f9f08f7e322b297ef77f426dde2a882700eb 100644 (file)
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -33,7 +33,7 @@
 #include "virutil.h"
 #include "intprops.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "c-ctype.h"
 #include "areadlink.h"
 

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 38335960ef4b7ecba7223997e6f4a10499ef9e22..0858553004b1c8fb59617fe8945303f4a2b98956 100644 (file)
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -28,7 +28,7 @@
 #include <sched.h>
 
 #include "virprocess.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "virutil.h"

diff --git a/src/util/virrandom.c b/src/util/virrandom.c
index 1b6de6b20580a3f27ec707f5fa6b7c9b2e504fda..6c5bc9162ece7d0388b088ffca0490bb361f51da 100644 (file)
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -30,7 +30,7 @@
 #include "virthread.h"
 #include "count-one-bits.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/util/virsexpr.c b/src/util/virsexpr.c
index 0e07c115fc7e1121ea9021f747611d95d3955967..81dfbe61e3ed9d400e8132bb46af6486f42080df 100644 (file)
--- a/src/util/virsexpr.c
+++ b/src/util/virsexpr.c
@@ -28,7 +28,7 @@
 #include "c-ctype.h"
 #include <errno.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virsexpr.h"
 #include "virutil.h"
 #include "viralloc.h"

diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index 0f2f23d135d42dd3d7f5786b19a966158aebded3..7bc43a97fc0d89d8d020710c0e493969844705e0 100644 (file)
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "virsocketaddr.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 
 #include <netdb.h>

diff --git a/src/util/virstatslinux.c b/src/util/virstatslinux.c
index 7d3f9589a295ffdb868a6d1b4d4f859cd6a09def..d3e1a0262bd5beea9b3e43b19936d9964c1b89fb 100644 (file)
--- a/src/util/virstatslinux.c
+++ b/src/util/virstatslinux.c
@@ -32,7 +32,7 @@
 # include <unistd.h>
 # include <regex.h>
 
-# include "virterror_internal.h"
+# include "virerror.h"
 # include "datatypes.h"
 # include "virutil.h"
 # include "virstatslinux.h"

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 760e3a6abfa6fdd0c010af975cd3d675ff882e7a..c7941c359147eee5a4b72724ac63d517cb6a7eed 100644 (file)
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -36,7 +36,7 @@
 #endif
 #include "dirname.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virfile.h"
 #include "c-ctype.h"

diff --git a/src/util/virstring.c b/src/util/virstring.c
index 5607b3e217aa996cca2b331c82f45689ae56da7d..0420ca37f9d2fcc5829a06a2fa1ec270f73deee6 100644 (file)
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -24,7 +24,7 @@
 #include "virstring.h"
 #include "viralloc.h"
 #include "virbuffer.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index 6ebeaf68b0b056659d1c1f03fe102b815cdea407..83c445d103ead22ae2fa4d2b4089ac0e15a58677 100644 (file)
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virsysinfo.h"
 #include "virutil.h"
 #include "virlog.h"

diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c
index 37730530e7fdfaa9885f6e50415dfbdcc1a35578..7b8ba70a75c27442db9e2502dd80c620b2d4c155 100644 (file)
--- a/src/util/virthreadpool.c
+++ b/src/util/virthreadpool.c
@@ -28,7 +28,7 @@
 #include "virthreadpool.h"
 #include "viralloc.h"
 #include "virthread.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/virtime.c b/src/util/virtime.c
index c614380f909be96836970d27c7c9594fd7a58354..b54a4e8d6bff2b8590fa76c8de939af320dcf756 100644 (file)
--- a/src/util/virtime.c
+++ b/src/util/virtime.c
@@ -39,7 +39,7 @@
 #include "virtime.h"
 #include "virutil.h"
 #include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index 60fb485f0774854ad032ce6a915829b44e9522bf..33e6a09bf2bcea7138ca01f11e5b561e8222feff 100644 (file)
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -26,7 +26,7 @@
 
 #include "viralloc.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/viruri.c b/src/util/viruri.c
index e59cd5adb0c8ae2935e7adb1dc31a61eaf4c2047..2888cb0c0a7e6371b49b6979ec002dd2bb450550 100644 (file)
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -24,7 +24,7 @@
 
 #include "viralloc.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virbuffer.h"
 
 #define VIR_FROM_THIS VIR_FROM_URI

diff --git a/src/util/virusb.c b/src/util/virusb.c
index 64bc66e42084c6bdcc8b3157f93ddb3cb120ee49..c09f6da366abcf84cd79f6e6c3d19745a41f2d73 100644 (file)
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -37,7 +37,7 @@
 #include "virlog.h"
 #include "viralloc.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define USB_SYSFS "/sys/bus/usb"
 #define USB_ID_LEN 10 /* "1234 5678" */

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 7866aac98fdef17838600b308a08a3fd75c28410..78ca9e87d4455092e25b723a2f507f5d8d1fede6 100644 (file)
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -75,7 +75,7 @@
 
 #include "c-ctype.h"
 #include "dirname.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virbuffer.h"
 #include "virutil.h"

diff --git a/src/util/viruuid.c b/src/util/viruuid.c
index 0cd70d1f2a6542bf862c3515f297e8af82eb66f6..7250543fe1d264a5214b2ab3e76700a06b19c23d 100644 (file)
--- a/src/util/viruuid.c
+++ b/src/util/viruuid.c
@@ -38,7 +38,7 @@
 #include "c-ctype.h"
 #include "internal.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "viralloc.h"
 #include "virfile.h"

diff --git a/src/util/virxml.c b/src/util/virxml.c
index 7986d232d72d222955daea21ef671c43be704f99..74f8bebfb90fec67523517b3c62e3212108ee436 100644 (file)
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -30,7 +30,7 @@
 #include <math.h>               /* for isnan() */
 #include <sys/stat.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virxml.h"
 #include "virbuffer.h"
 #include "virutil.h"

diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c
index 36539f62d01f37fde5af18b5bb848966b4ca6d52..b5fb821c92cbb7712bcbd84898fd4255ed3f3b52 100644 (file)
--- a/src/vbox/vbox_MSCOMGlue.c
+++ b/src/vbox/vbox_MSCOMGlue.c
@@ -33,7 +33,7 @@
 #include "viralloc.h"
 #include "virutil.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "vbox_MSCOMGlue.h"
 
 #define VIR_FROM_THIS VIR_FROM_VBOX

diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index 1954ddbc1f93076ef0930e6cb0c677dd4a05c853..2b568e238bc908afe47de2746ed7134991f38e4d 100644 (file)
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -40,7 +40,7 @@
 #include "viralloc.h"
 #include "virutil.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_VBOX
 

diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index f2a0c8f889c5467d55498852333b2778c20f3e6d..736c895bb6dd5231336c24fb3b4d75e853d0dda2 100644 (file)
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -37,7 +37,7 @@
 #include "virlog.h"
 #include "vbox_driver.h"
 #include "vbox_glue.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_VBOX

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 597a7c53d5b20a4ddc945fadd114cce568463af7..2b3fa255c4679bc9dd80ac400cf199e9d6b7effc 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -44,7 +44,7 @@
 #include "domain_conf.h"
 #include "snapshot_conf.h"
 #include "network_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "domain_event.h"
 #include "storage_conf.h"
 #include "virstoragefile.h"

diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 2cbdd7cd07fec59dcf59cf8ef30494e134052116..b514636954c7db7c1acf3ae8f7211c757e18c2e9 100644 (file)
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -30,7 +30,7 @@
 #include "nodeinfo.h"
 #include "virfile.h"
 #include "viruuid.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "vmx.h"
 
 #include "vmware_conf.h"

diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 67cdc8888e287de95039a66acd1f5b6561b86e0c..3763f40c98fab37ac3e0ce31607ffc113599cd95 100644 (file)
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -24,7 +24,7 @@
 #include <fcntl.h>
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "virfile.h"
 #include "viralloc.h"

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 552f5788dbadf88e4710d7ed3bbd7278d76df049..c604bd2b30c8ae189dd6a9654895dac903484a10 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -26,7 +26,7 @@
 #include <c-ctype.h>
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virconf.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c
index 3f7c97b778ebc15c54f1c74743dbdd8008526929..9f5823cc931d64e1323e5a8ab64dd50793882942 100644 (file)
--- a/src/xen/block_stats.c
+++ b/src/xen/block_stats.c
@@ -38,7 +38,7 @@
 #  include <xs.h>
 # endif
 
-# include "virterror_internal.h"
+# include "virerror.h"
 # include "datatypes.h"
 # include "virutil.h"
 # include "block_stats.h"

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index c35695a477d8df026560b048f0b53306fc00a7b4..2ef2c57adc66e0e7b169c43acbac710f27c08234 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -39,7 +39,7 @@
 #include <fcntl.h>
 #include <xen/dom0_ops.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "datatypes.h"
 #include "xen_driver.h"

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 9443d9869d286761cf2615013d973232251df05e..a770f53f2407d8c6d6181bdc860a39389793ffdf 100644 (file)
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -62,7 +62,7 @@
 /* required for shutdown flags */
 #include <xen/sched.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "datatypes.h"
 #include "driver.h"

diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 4cce25a00440aa1f8e0d7f95b86c71c965b267e5..2043c7499a4fd8502f3b8ed0bc1385a90f7aed53 100644 (file)
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -27,7 +27,7 @@
 #include <dirent.h>
 #include <sys/inotify.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "driver.h"
 #include "viralloc.h"

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 120e2379da8820b078eb99078e5a541506769b48..84a25e80c115088bf0bcd5f1ecb7da22be482aa8 100644 (file)
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -29,7 +29,7 @@
 #include <netdb.h>
 #include <errno.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "datatypes.h"
 #include "xend_internal.h"

diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 0806e7729a789c989910fde70ca53d19aa09d790..003e8f7a161c3a99012734304e5eaf8d9da8d882 100644 (file)
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -35,7 +35,7 @@
 #include <stdint.h>
 #include <xen/dom0_ops.h>
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "xm_internal.h"
 #include "xen_driver.h"

diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index 20332df12ad77cd056607e7778ed67cc5232619b..9308522db86a44de933c4dbc99f1b652ac8f9fa0 100644 (file)
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -41,7 +41,7 @@
 # include <xs.h>
 #endif
 
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "driver.h"
 #include "viralloc.h"

diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 4df6c5b1e44c4a3578e3e33c5e8d1a5416b397cd..b812aeb04e251df046f673608907cb1df36e2ff4 100644 (file)
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -28,7 +28,7 @@
 #include <xen/api/xen_all.h>
 #include "internal.h"
 #include "domain_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "virauth.h"
 #include "virutil.h"

diff --git a/src/xenapi/xenapi_driver_private.h b/src/xenapi/xenapi_driver_private.h
index 42684bd7ba0374cf72fc2ae451295324174aee51..7e5b6e7c8b6f3fbdf777325ef23d35509eac0969 100644 (file)
--- a/src/xenapi/xenapi_driver_private.h
+++ b/src/xenapi/xenapi_driver_private.h
@@ -25,7 +25,7 @@
 
 # include <libxml/tree.h>
 # include <xen/api/xen_common.h>
-# include "virterror_internal.h"
+# include "virerror.h"
 
 /*# define PRINT_XML*/
 # define VIR_FROM_THIS VIR_FROM_XENAPI

diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index 5c53b691ed86a1d2be23d17fc941b04ae8237afc..3b8384eb92f8a2555aa66022c8ffc1d3122673b6 100644 (file)
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -27,7 +27,7 @@
 #include <xen/api/xen_all.h>
 #include "internal.h"
 #include "domain_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "datatypes.h"
 #include "virutil.h"
 #include "viruuid.h"

diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index b83ac58080fc3abcd2a20bd2b363ec48db9f2d95..83b7c7430b07412c14ae0627583eca6918ac785b 100644 (file)
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -27,7 +27,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virconf.h"
 #include "viralloc.h"
 #include "verify.h"

diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index d965d799404815da0157a937bfb4f690e5cd02c9..73ba06b39fa6e606a5718a2b28a99f8109264d1b 100644 (file)
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -26,7 +26,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virconf.h"
 #include "viralloc.h"
 #include "verify.h"

diff --git a/tests/commandtest.c b/tests/commandtest.c
index d6a285e85937c45a72a5ed6421aa6596c0e63642..fd2b8c0cfbf6a28895b755c7a180f0f23bc2045d 100644 (file)
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -36,7 +36,7 @@
 #include "vircommand.h"
 #include "virfile.h"
 #include "virpidfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c
index c1d94d224ce22a19dcdc0abe2d590bad823aa58f..fd033f8f0c7c3446508dbf8d742b963731fba07d 100644 (file)
--- a/tests/libvirtdconftest.c
+++ b/tests/libvirtdconftest.c
@@ -26,7 +26,7 @@
 #include "daemon/libvirtd-config.h"
 #include "virutil.h"
 #include "c-ctype.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virlog.h"
 #include "virconf.h"
 

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index e1b6c5637309ef8a1024009cc75bea9913f8a3ef..35f2da6a569b0b78891f341b98bc24742ef3e49b 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -23,7 +23,7 @@
 #include "testutilsqemu.h"
 #include "qemumonitortestutils.h"
 #include "virthread.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index b82eb5d06383f823391b30e9d24d0a3fe8d2dd87..78eab295ae3bafdef9c50ce14b59eb6a8e6f4a4d 100644 (file)
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -32,7 +32,7 @@
 #include "viralloc.h"
 #include "virutil.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index 93742cf50f19e8fc75fe80f9d41bce3dc5898dfa..0dff8721e7ed146a82962d701780dd87614c3995 100644 (file)
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -33,7 +33,7 @@
 #include "viralloc.h"
 #include "virutil.h"
 #include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "security/security_manager.h"
 
 

diff --git a/tests/testutils.c b/tests/testutils.c
index d88af21b1fc700bad125ddc3463212495e5f9aa9..9c8f3651f9548604fc067d5a4f5492ad7346ddfb 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -42,7 +42,7 @@
 #include "viralloc.h"
 #include "virutil.h"
 #include "virthread.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virbuffer.h"
 #include "virlog.h"
 #include "vircommand.h"

diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index 2ad237d50c0dc8eaa68280ec8bc1ced238e95a72..67c5de817d570bc99caacf2e7caa7bc310afec96 100644 (file)
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -25,7 +25,7 @@
 
 #include "testutils.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 

diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index cab47d37517cdd7b064ca04045f4136052de4d33..de8cf70532306468c8f4e9a2f2b3db34e014822c 100644 (file)
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -22,7 +22,7 @@
 
 #include "testutils.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "driver.h"

diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c
index 33f64c145d0d477dca26e0042cbf8c521aec3502..fb41840f860d85012081627c056765b21854bec5 100644 (file)
--- a/tests/virkeyfiletest.c
+++ b/tests/virkeyfiletest.c
@@ -25,7 +25,7 @@
 
 #include "testutils.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 

diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index c434f472fbaa4daa09c7da598312a144acc0e2ef..8673700bc2779eb67a65e75b17893130e32368da 100644 (file)
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -26,7 +26,7 @@
 
 #include "testutils.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 

diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c
index 4e7a1fdfd0c8510c95a2a74b2694239a4dbbefbd..e58fd1feeec3de21988b1e45f89c5a3e73084be5 100644 (file)
--- a/tests/virnetmessagetest.c
+++ b/tests/virnetmessagetest.c
@@ -25,7 +25,7 @@
 
 #include "testutils.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 

diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index 819257b655d61776d8f190eb8fb99241fe36dd7c..b968973c02b8cb44eddc572a06f9fe24e32dcd10 100644 (file)
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -29,7 +29,7 @@
 
 #include "testutils.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index d945181d5eba6d32bc13d6c696ad6d8b64cb8a23..a1e71dc5f59528e3f6946f2156c8861840e85720 100644 (file)
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -28,7 +28,7 @@
 
 #include "testutils.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index 58ab843add72bbd33b3d75a4fb22edaae47b2da0..86d8986cd7ce65f897b0d386f8df7876760ef726 100644 (file)
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -24,7 +24,7 @@
 
 #include "testutils.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 

diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index 1c22d07ef214ca6abb5c988a6b3e3c57a67b7134..18f621a61047ba84a76754b15bd793891e3b12a5 100644 (file)
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -25,7 +25,7 @@
 
 #include "testutils.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 

diff --git a/tests/viruritest.c b/tests/viruritest.c
index ad59270489fe548f4d200160a3b5d488575f4e3f..3cb88daee3e627183f866ad2dbba04222cbe99a0 100644 (file)
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -25,7 +25,7 @@
 
 #include "testutils.h"
 #include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"
 

diff --git a/tools/console.c b/tools/console.c
index d024d38415e38fa7452df916326fbb27d5c3cee8..29873eacf24dfa6eff66383a87741ac0bbbced4e 100644 (file)
--- a/tools/console.c
+++ b/tools/console.c
@@ -43,7 +43,7 @@
 # include "virfile.h"
 # include "viralloc.h"
 # include "virthread.h"
-# include "virterror_internal.h"
+# include "virerror.h"
 
 /*
  * Convert given character to control character.

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 3a9cebe548f060b159e2f41f19867573d0124bc1..f3da1d5ddb47480b7d53694864c71e8d061660d9 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -49,7 +49,7 @@
 #include "virmacaddr.h"
 #include "virstring.h"
 #include "virsh-domain-monitor.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "virtypedparam.h"
 #include "virxml.h"
 

diff --git a/tools/virsh.c b/tools/virsh.c
index 790cf567e151df2dd0111ad24fdfe8f7a69f6636..283194ac82353a09b0e0fa8bfe707e1a9704024c 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -54,7 +54,7 @@
 #endif
 
 #include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
 #include "base64.h"
 #include "virbuffer.h"
 #include "console.h"

diff --git a/tools/virsh.h b/tools/virsh.h
index 6e6d3eef845c5e9eea0863e1cbf333a593cfd689..ab7161fa6157b3715a741ac5529f7ce70c3f3b98 100644 (file)
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -34,7 +34,7 @@
 # include <inttypes.h>
 
 # include "internal.h"
-# include "virterror_internal.h"
+# include "virerror.h"
 # include "virthread.h"
 # include "virnetdevbandwidth.h"