[libvirt] [PATCH v2 26/28] Rename xml.{c,h} to virxml.{c,h}
Daniel P. Berrange
berrange at redhat.com
Wed Dec 19 11:55:46 UTC 2012
From: "Daniel P. Berrange" <berrange at redhat.com>
---
cfg.mk | 2 +-
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/conf/cpu_conf.h | 2 +-
src/conf/device_conf.c | 2 +-
src/conf/domain_conf.c | 2 +-
src/conf/interface_conf.c | 2 +-
src/conf/netdev_bandwidth_conf.h | 2 +-
src/conf/netdev_vlan_conf.h | 2 +-
src/conf/netdev_vport_profile_conf.h | 2 +-
src/conf/network_conf.c | 2 +-
src/conf/node_device_conf.c | 2 +-
src/conf/nwfilter_conf.h | 2 +-
src/conf/secret_conf.c | 2 +-
src/conf/snapshot_conf.c | 2 +-
src/conf/storage_conf.c | 2 +-
src/conf/storage_encryption_conf.c | 2 +-
src/cpu/cpu.c | 2 +-
src/cpu/cpu_map.h | 2 +-
src/esx/esx_vi.c | 2 +-
src/qemu/qemu_conf.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/security/virt-aa-helper.c | 2 +-
src/storage/storage_backend_fs.c | 2 +-
src/test/test_driver.c | 2 +-
src/util/{xml.c => virxml.c} | 2 +-
src/util/{xml.h => virxml.h} | 0
src/xen/xen_driver.c | 2 +-
tests/cputest.c | 2 +-
tests/nwfilterxml2xmltest.c | 2 +-
tests/sexpr2xmltest.c | 2 +-
tests/virshtest.c | 2 +-
tests/xencapstest.c | 2 +-
tools/virsh-domain-monitor.c | 2 +-
tools/virsh-domain.c | 2 +-
tools/virsh-host.c | 2 +-
tools/virsh-interface.c | 2 +-
tools/virsh-network.c | 2 +-
tools/virsh-nodedev.c | 2 +-
tools/virsh-nwfilter.c | 2 +-
tools/virsh-pool.c | 2 +-
tools/virsh-secret.c | 2 +-
tools/virsh-snapshot.c | 2 +-
tools/virsh-volume.c | 2 +-
tools/virsh.c | 2 +-
45 files changed, 44 insertions(+), 44 deletions(-)
rename src/util/{xml.c => virxml.c} (99%)
rename src/util/{xml.h => virxml.h} (100%)
diff --git a/cfg.mk b/cfg.mk
index 289567f..38d72e8 100644
--- 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 2cda7a9..34290e1 100644
--- 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 e8fd56e..7ebfabe 100644
--- 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 12865b4..23ea455 100644
--- 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 ecfaf30..45ecb28 100644
--- 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 7589b09..08f14ca 100644
--- 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 6a53bda..3867274 100644
--- 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 216a540..23aaaf3 100644
--- 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 19b50cc..480d6c6 100644
--- 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 15ecbd6..a70256d 100644
--- 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 01a6f2e..2bd04c5 100644
--- 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 67d743e..3c68011 100644
--- 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 2ca44b3..ca2c070 100644
--- 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 2abb95a..46d2ae5 100644
--- 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 3ad74d6..f7f8f63 100644
--- 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 4239e49..04b2581 100644
--- 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 8ea54fa..35e9da4 100644
--- 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 302629d..6beab55 100644
--- 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 9120513..8d27bcd 100644
--- 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 92ac8f8..99c1eb1 100644
--- 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 8a21703..ed18ac6 100644
--- 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 3832a6c..5b9fcf7 100644
--- 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 fbf0b03..70ff875 100644
--- 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 b744fb4..23fa0f5 100644
--- 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 1f2718c..4716e41 100644
--- 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 05c7f33..02f7d1a 100644
--- a/src/util/xml.c
+++ b/src/util/virxml.c
@@ -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 100%
rename from src/util/xml.h
rename to src/util/virxml.h
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 4cbe827..c35695a 100644
--- 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 6299409..ab96824 100644
--- 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 8c29a46..a215bf8 100644
--- 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 9b9b09d..07f6f8e 100644
--- 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 8741d47..b82a4c4 100644
--- 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 c94d5c5..b8ad831 100644
--- 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 a443988..f4940fa 100644
--- 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 244ffb8..3a9cebe 100644
--- 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 0ad4296..45b89a8 100644
--- 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 ea8a6c5..cd14e89 100644
--- 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 918dee6..c9cd15a 100644
--- 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 974e495..f9517cc 100644
--- 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 1480d13..9341ea7 100644
--- 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 b3177e0..adac7f1 100644
--- 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 a29454f..8297743 100644
--- 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 8428282..3b179e2 100644
--- 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 6f2c591..a57fc28 100644
--- 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 bfeaaa1..790cf56 100644
--- 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"
--
1.7.11.7
More information about the libvir-list
mailing list