Rename xml.{c,h} to virxml.{c,h}

diff --git a/cfg.mk b/cfg.mk
index 289567f77b3c621522604d6007edcba471b7ebed..38d72e839c21d333e485c133012f2d90ffa7c15c 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -809,7 +809,7 @@ exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/virutil\.c$$
 exclude_file_name_regexp--sc_prohibit_strtol = \
   ^src/(util/virsexpr|(vbox|xen|xenxs)/.*)\.c$$
 
-exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/xml\.c$$
+exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/virxml\.c$$
 
 exclude_file_name_regexp--sc_prohibit_xmlURI = ^src/util/viruri\.c$$
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2cda7a9c22cf54dad5a268af1b7dbf3a9508c6b0..34290e114dcc439b27ea66d435722db9864ae0ec 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -181,7 +181,7 @@ src/util/virtypedparam.c
 src/util/viruri.c
 src/util/virusb.c
 src/util/virutil.c
-src/util/xml.c
+src/util/virxml.c
 src/vbox/vbox_MSCOMGlue.c
 src/vbox/vbox_XPCOMCGlue.c
 src/vbox/vbox_driver.c

diff --git a/src/Makefile.am b/src/Makefile.am
index e8fd56ec180f051fbdbf541c35b1aecd6a20ae7e..7ebfabeedbfbde35a8820950fa5ff7ee87538ab4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,7 +86,6 @@ UTIL_SOURCES =                                                        \
                util/virthreadwin32.h                           \
                util/virthreadpool.c util/virthreadpool.h       \
                util/virtypedparam.c util/virtypedparam.h       \
-               util/xml.c util/xml.h                           \
                util/virterror.c util/virterror_internal.h      \
                util/vircgroup.c util/vircgroup.h               \
                util/virdbus.c util/virdbus.h                   \
@@ -116,6 +115,7 @@ UTIL_SOURCES =                                                      \
                util/viruri.h util/viruri.c                     \
                util/virutil.c util/virutil.h                   \
                util/viruuid.c util/viruuid.h                   \
+               util/virxml.c util/virxml.h                     \
                $(NULL)
 
 EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \

diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 12865b434dcd378e21aeeb4d21a8413eb1b55214..23ea455a2d39c8c30e1f47bf2556c5352467a8a0 100644 (file)
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -26,7 +26,7 @@
 
 # include "virutil.h"
 # include "virbuffer.h"
-# include "xml.h"
+# include "virxml.h"
 # include "virbitmap.h"
 # include "virarch.h"
 

diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index ecfaf30840931ed5477aa6715fd8283abb6677ec..45ecb28776ae2cdbddaaceb5df020b9443767d93 100644 (file)
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -24,7 +24,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
 #include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a807c4d03e5e6219ce3fde7f978920e16422aeef..f979cfcb6dd982beda04f0907a538108aad3e091 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -36,7 +36,7 @@
 #include "snapshot_conf.h"
 #include "viralloc.h"
 #include "verify.h"
-#include "xml.h"
+#include "virxml.h"
 #include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"

diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 6a53bda0eb68d737d1dd619ada801b38e9c72db7..38672746caecd4824a55ecabce9e9dbaf419180f 100644 (file)
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -28,7 +28,7 @@
 #include "interface_conf.h"
 
 #include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
 #include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"

diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h
index 216a540c6da6f5c3b624368a1de91e48418879e7..23aaaf319aa3e629a67edfe3eafd97dad515e24d 100644 (file)
--- a/src/conf/netdev_bandwidth_conf.h
+++ b/src/conf/netdev_bandwidth_conf.h
@@ -26,7 +26,7 @@
 # include "internal.h"
 # include "virnetdevbandwidth.h"
 # include "virbuffer.h"
-# include "xml.h"
+# include "virxml.h"
 
 virNetDevBandwidthPtr virNetDevBandwidthParse(xmlNodePtr node,
                                               int net_type)

diff --git a/src/conf/netdev_vlan_conf.h b/src/conf/netdev_vlan_conf.h
index 19b50ccdbccfe4acbd5262e0f7e1a5373755b24c..480d6c620489d0f74956dc1cb2f36c68278b88c1 100644 (file)
--- a/src/conf/netdev_vlan_conf.h
+++ b/src/conf/netdev_vlan_conf.h
@@ -25,7 +25,7 @@
 # include "internal.h"
 # include "virnetdevvlan.h"
 # include "virbuffer.h"
-# include "xml.h"
+# include "virxml.h"
 
 int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def);
 int virNetDevVlanFormat(virNetDevVlanPtr def, virBufferPtr buf);

diff --git a/src/conf/netdev_vport_profile_conf.h b/src/conf/netdev_vport_profile_conf.h
index 15ecbd68650daeb453745e2050871587a1d11937..a70256dc7e76ab5c080986cf7c98f520df4755ed 100644 (file)
--- a/src/conf/netdev_vport_profile_conf.h
+++ b/src/conf/netdev_vport_profile_conf.h
@@ -26,7 +26,7 @@
 # include "internal.h"
 # include "virnetdevvportprofile.h"
 # include "virbuffer.h"
-# include "xml.h"
+# include "virxml.h"
 
 typedef enum {
     /* generate random defaults for interfaceID/interfaceID

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 01a6f2e3e9bbf605ddadd52eea76ce837bb454b6..2bd04c510a73b4e0865ed343e2a59d0b33052a3c 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -38,7 +38,7 @@
 #include "netdev_bandwidth_conf.h"
 #include "netdev_vlan_conf.h"
 #include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
 #include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 67d743ec563d5b13b6d36404b6d25b23860583c1..3c68011b73f4a8441576862bb4e132f6eaed5313 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -32,7 +32,7 @@
 
 #include "node_device_conf.h"
 #include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
 #include "virutil.h"
 #include "virbuffer.h"
 #include "viruuid.h"

diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index 2ca44b34d8ece2b340e4b3ade37bc45fd9a35eed..ca2c070218e1908b3e4d5f9db885ad4385aa1592 100644 (file)
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -30,7 +30,7 @@
 
 # include "virutil.h"
 # include "virhash.h"
-# include "xml.h"
+# include "virxml.h"
 # include "virbuffer.h"
 # include "virsocketaddr.h"
 # include "virmacaddr.h"

diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 2abb95a9e61890ac51b4a25c8aa183f2c0d3c659..46d2ae51bc893716fcccc4e6e716596c4af17777 100644 (file)
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -30,7 +30,7 @@
 #include "secret_conf.h"
 #include "virterror_internal.h"
 #include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
 #include "viruuid.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECRET

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 3ad74d6a055ac9d6495bddadab03afe6172baf7c..f7f8f63303e0e182373ca9c19d2076d1dd6eb2d1 100644 (file)
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -46,7 +46,7 @@
 #include "viruuid.h"
 #include "virfile.h"
 #include "virterror_internal.h"
-#include "xml.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 4239e493ae371b10f0de195774255a6a967b1ab4..04b25812ab2abd9fff78dc858be6860f3ebae999 100644 (file)
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -38,7 +38,7 @@
 #include "storage_conf.h"
 #include "virstoragefile.h"
 
-#include "xml.h"
+#include "virxml.h"
 #include "viruuid.h"
 #include "virbuffer.h"
 #include "virutil.h"

diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c
index 8ea54fafab27ba42f48237beea7005fe822f67d8..35e9da4ab23c438fbdd61be67182d6aae0929052 100644 (file)
--- a/src/conf/storage_encryption_conf.c
+++ b/src/conf/storage_encryption_conf.c
@@ -32,7 +32,7 @@
 #include "storage_conf.h"
 #include "storage_encryption_conf.h"
 #include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
 #include "virterror_internal.h"
 #include "viruuid.h"
 #include "virfile.h"

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 302629dd6a52daa823ae893251d78c985f83ac53..6beab5508cf9e100a186173e67335fca9e07ec5f 100644 (file)
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -25,7 +25,7 @@
 
 #include "virlog.h"
 #include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
 #include "cpu.h"
 #include "cpu_x86.h"
 #include "cpu_powerpc.h"

diff --git a/src/cpu/cpu_map.h b/src/cpu/cpu_map.h
index 912051342f358b1c43e22536f3ce3633fb1761a6..8d27bcd372d666843fee18d430e003d3bb6fcc5d 100644 (file)
--- a/src/cpu/cpu_map.h
+++ b/src/cpu/cpu_map.h
@@ -24,7 +24,7 @@
 #ifndef __VIR_CPU_MAP_H__
 # define __VIR_CPU_MAP_H__
 
-# include "xml.h"
+# include "virxml.h"
 
 
 enum cpuMapElement {

diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 92ac8f86c18d4af17da16dfc74c7f2f5eb209214..99c1eb1e0f6f41914c10768d75088d1286df7a43 100644 (file)
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -32,7 +32,7 @@
 #include "virutil.h"
 #include "viruuid.h"
 #include "vmx.h"
-#include "xml.h"
+#include "virxml.h"
 #include "esx_vi.h"
 #include "esx_vi_methods.h"
 #include "esx_util.h"

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 8a21703643f2dad2f4a21ba90e4adcc0390032ae..ed18ac6eeae00dc20e2fe16c3cbbbd70cc8a360a 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -45,7 +45,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "datatypes.h"
-#include "xml.h"
+#include "virxml.h"
 #include "nodeinfo.h"
 #include "virlog.h"
 #include "cpu/cpu.h"

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3832a6c5c2ed47513291a1b168c32f04420184c4..5b9fcf7f0ce9f4eacb0eeb29d783cf28a72c3d73 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -75,7 +75,7 @@
 #include "virusb.h"
 #include "virprocess.h"
 #include "libvirt_internal.h"
-#include "xml.h"
+#include "virxml.h"
 #include "cpu/cpu.h"
 #include "virsysinfo.h"
 #include "domain_nwfilter.h"

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 900e28410147f5b4be3db78fdd12710bc7ead194..0aa978e0fd20e672e37358ae246b5865dda315d7 100644 (file)
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -48,7 +48,7 @@
 #include "security_driver.h"
 #include "security_apparmor.h"
 #include "domain_conf.h"
-#include "xml.h"
+#include "virxml.h"
 #include "viruuid.h"
 #include "virusb.h"
 #include "virpci.h"

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index b744fb421b3b3177604833a8440cdc5d73344531..23fa0f5b963c40556b6a7b8419355a65309631fb 100644 (file)
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -47,7 +47,7 @@
 #include "virstoragefile.h"
 #include "vircommand.h"
 #include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
 #include "virfile.h"
 #include "virlog.h"
 

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 1f2718c018b78bfb5d5ad9b29830bd360e6ba7c6..4716e41fceaf05d0380d504c3a427cb1eb686aab 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -46,7 +46,7 @@
 #include "domain_event.h"
 #include "storage_conf.h"
 #include "node_device_conf.h"
-#include "xml.h"
+#include "virxml.h"
 #include "virthread.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/src/util/xml.c b/src/util/virxml.c
similarity index 99%
rename from src/util/xml.c
rename to src/util/virxml.c
index 05c7f331d69a713c238f121c29d1d045e6482c42..7986d232d72d222955daea21ef671c43be704f99 100644 (file)
--- a/src/util/xml.c
+++ b/src/util/virxml.c
@@ -1,5 +1,5 @@
 /*
- * xml.c: XML based interfaces for the libvir library
+ * virxml.c: helper APIs for dealing with XML documents
  *
  * Copyright (C) 2005, 2007-2012 Red Hat, Inc.
  *
@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 
 #include "virterror_internal.h"
-#include "xml.h"
+#include "virxml.h"
 #include "virbuffer.h"
 #include "virutil.h"
 #include "viralloc.h"

diff --git a/src/util/xml.h b/src/util/virxml.h
similarity index 87%
rename from src/util/xml.h
rename to src/util/virxml.h
index c3b05dfdc76fa05305155c9905eff6c538cf9fcf..364288dd5514be1fc58f134602ae1b282c5facf7 100644 (file)
--- a/src/util/xml.h
+++ b/src/util/virxml.h
@@ -1,5 +1,23 @@
 /*
- * xml.h: internal definitions used for XML parsing routines.
+ * virxml.c: helper APIs for dealing with XML documents
+ *
+ * Copyright (C) 2005, 2007-2012 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Daniel Veillard <veillard@redhat.com>
  */
 
 #ifndef __VIR_XML_H__

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 4cbe827bdf70e02fbfdd00bcc25c5b00d36b1b42..c35695a477d8df026560b048f0b53306fc00a7b4 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -53,7 +53,7 @@
 #if WITH_XEN_INOTIFY
 # include "xen_inotify.h"
 #endif
-#include "xml.h"
+#include "virxml.h"
 #include "virutil.h"
 #include "viralloc.h"
 #include "node_device_conf.h"

diff --git a/tests/cputest.c b/tests/cputest.c
index 62994094d1f75d75e9795ea900f6e8cf51791e58..ab96824b98d0334aa97edf7f7c89783c7a70cf1c 100644 (file)
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 
 #include "internal.h"
-#include "xml.h"
+#include "virxml.h"
 #include "viralloc.h"
 #include "virbuffer.h"
 #include "testutils.h"

diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c
index 8c29a46b69a9447e686df837395159f4e0575371..a215bf8ab7bde98e1dd8cd70262fe7965dd846d1 100644 (file)
--- a/tests/nwfilterxml2xmltest.c
+++ b/tests/nwfilterxml2xmltest.c
@@ -10,7 +10,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "xml.h"
+#include "virxml.h"
 #include "virthread.h"
 #include "nwfilter_params.h"
 #include "nwfilter_conf.h"

diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index 9b9b09d5d3c291defce99703069d107f6126420a..07f6f8eb45af05ecb33e9b5ab257845129018194 100644 (file)
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #include "internal.h"
-#include "xml.h"
+#include "virxml.h"
 #include "datatypes.h"
 #include "xen/xen_driver.h"
 #include "xen/xend_internal.h"

diff --git a/tests/virshtest.c b/tests/virshtest.c
index 8741d47c473bbc85101e32b34e3750dbac39a4b3..b82a4c4901f63fce43704937b31dfa2e3facc076 100644 (file)
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #include "internal.h"
-#include "xml.h"
+#include "virxml.h"
 #include "virutil.h"
 #include "testutils.h"
 

diff --git a/tests/xencapstest.c b/tests/xencapstest.c
index c94d5c5c74975cfe108c810869a844a470ce811e..b8ad831973e1ff2bf0a65a2c6e3a2c49ea8fed99 100644 (file)
--- a/tests/xencapstest.c
+++ b/tests/xencapstest.c
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 #include "internal.h"
-#include "xml.h"
+#include "virxml.h"
 #include "testutils.h"
 #include "xen/xen_hypervisor.h"
 #include "virfile.h"

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index a44398849cd6b3632e2015516198a19cd099a3c2..f4940faf91b23334fbaeebda100c2b4cb65344a5 100644 (file)
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -37,7 +37,7 @@
 #include "viralloc.h"
 #include "virmacaddr.h"
 #include "virsh-domain.h"
-#include "xml.h"
+#include "virxml.h"
 
 static const char *
 vshDomainIOErrorToString(int error)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 244ffb820477513c14e9b50ebd50b431bdf88660..3a9cebe548f060b159e2f41f19867573d0124bc1 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -51,7 +51,7 @@
 #include "virsh-domain-monitor.h"
 #include "virterror_internal.h"
 #include "virtypedparam.h"
-#include "xml.h"
+#include "virxml.h"
 
 /* Gnulib doesn't guarantee SA_SIGINFO support.  */
 #ifndef SA_SIGINFO

diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index 0ad4296eafbeea363be4943525e63765684bf2b9..45b89a853c12831f0ac02d13f17dbcac1ae21b54 100644 (file)
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -36,7 +36,7 @@
 #include "viralloc.h"
 #include "virutil.h"
 #include "virsh-domain.h"
-#include "xml.h"
+#include "virxml.h"
 #include "virtypedparam.h"
 #include "virjson.h"
 

diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index ea8a6c5500e56f55a852281231292e2bb572c958..cd14e89170fc22576c1df8e0628fe1fe905cb52e 100644 (file)
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -35,7 +35,7 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
 
 virInterfacePtr
 vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd,

diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index 918dee68853ebf8461dd403e3e1eb32cb81cfe37..c9cd15a944ace11e952370cf79c21fc7a0747b89 100644 (file)
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -35,7 +35,7 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
 #include "conf/network_conf.h"
 
 virNetworkPtr

diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 974e495b30fd90be1fa99e9300d61072e07197ee..f9517ccd8564e50aea9eb45c269ee390f0ab44f7 100644 (file)
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -35,7 +35,7 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
 #include "conf/node_device_conf.h"
 
 /*

diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index 1480d133b64aba7b0bc96d7b99c4bac75e80ddf6..9341ea793dbfda672629d3f97d1e3f605082283f 100644 (file)
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -35,7 +35,7 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
 
 virNWFilterPtr
 vshCommandOptNWFilterBy(vshControl *ctl, const vshCmd *cmd,

diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index b3177e0c42f7fa10870cbee8fc6351acc66b6714..adac7f1e15dbd37031f45769fd276c7978cb9485 100644 (file)
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -35,7 +35,7 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
 #include "conf/storage_conf.h"
 
 virStoragePoolPtr

diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index a29454ff276e255a0b71acf64bae7d50bb6f7585..829774315f31f2167893d663e53e2778b4459d1c 100644 (file)
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -36,7 +36,7 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
 
 static virSecretPtr
 vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name)

diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 842828215829c58720352da5ac2c83a44d0c71a9..3b179e2676d865d86b7f26b858cdea82ee7af94e 100644 (file)
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -38,7 +38,7 @@
 #include "viralloc.h"
 #include "virutil.h"
 #include "virsh-domain.h"
-#include "xml.h"
+#include "virxml.h"
 #include "conf/snapshot_conf.h"
 
 /* Helper for snapshot-create and snapshot-create-as */

diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index 6f2c5910fe7bafa569ff0be5878c032c98db1afc..a57fc282453c4cd64212886adcd8f5d661aa6752 100644 (file)
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -39,7 +39,7 @@
 #include "virutil.h"
 #include "virfile.h"
 #include "virsh-pool.h"
-#include "xml.h"
+#include "virxml.h"
 
 virStorageVolPtr
 vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd,

diff --git a/tools/virsh.c b/tools/virsh.c
index bfeaaa14d6d6858c9bd1265f27ec58c6c80a2955..790cf567e151df2dd0111ad24fdfe8f7a69f6636 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -60,7 +60,7 @@
 #include "console.h"
 #include "virutil.h"
 #include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
 #include "libvirt/libvirt-qemu.h"
 #include "virfile.h"
 #include "configmake.h"