提交 556cf5f6 编写于 作者: D Daniel P. Berrange

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

上级 e861b312
...@@ -809,7 +809,7 @@ exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/virutil\.c$$ ...@@ -809,7 +809,7 @@ exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/virutil\.c$$
exclude_file_name_regexp--sc_prohibit_strtol = \ exclude_file_name_regexp--sc_prohibit_strtol = \
^src/(util/virsexpr|(vbox|xen|xenxs)/.*)\.c$$ ^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$$ exclude_file_name_regexp--sc_prohibit_xmlURI = ^src/util/viruri\.c$$
......
...@@ -181,7 +181,7 @@ src/util/virtypedparam.c ...@@ -181,7 +181,7 @@ src/util/virtypedparam.c
src/util/viruri.c src/util/viruri.c
src/util/virusb.c src/util/virusb.c
src/util/virutil.c src/util/virutil.c
src/util/xml.c src/util/virxml.c
src/vbox/vbox_MSCOMGlue.c src/vbox/vbox_MSCOMGlue.c
src/vbox/vbox_XPCOMCGlue.c src/vbox/vbox_XPCOMCGlue.c
src/vbox/vbox_driver.c src/vbox/vbox_driver.c
......
...@@ -86,7 +86,6 @@ UTIL_SOURCES = \ ...@@ -86,7 +86,6 @@ UTIL_SOURCES = \
util/virthreadwin32.h \ util/virthreadwin32.h \
util/virthreadpool.c util/virthreadpool.h \ util/virthreadpool.c util/virthreadpool.h \
util/virtypedparam.c util/virtypedparam.h \ util/virtypedparam.c util/virtypedparam.h \
util/xml.c util/xml.h \
util/virterror.c util/virterror_internal.h \ util/virterror.c util/virterror_internal.h \
util/vircgroup.c util/vircgroup.h \ util/vircgroup.c util/vircgroup.h \
util/virdbus.c util/virdbus.h \ util/virdbus.c util/virdbus.h \
...@@ -116,6 +115,7 @@ UTIL_SOURCES = \ ...@@ -116,6 +115,7 @@ UTIL_SOURCES = \
util/viruri.h util/viruri.c \ util/viruri.h util/viruri.c \
util/virutil.c util/virutil.h \ util/virutil.c util/virutil.h \
util/viruuid.c util/viruuid.h \ util/viruuid.c util/viruuid.h \
util/virxml.c util/virxml.h \
$(NULL) $(NULL)
EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \ EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
# include "virutil.h" # include "virutil.h"
# include "virbuffer.h" # include "virbuffer.h"
# include "xml.h" # include "virxml.h"
# include "virbitmap.h" # include "virbitmap.h"
# include "virarch.h" # include "virarch.h"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "virterror_internal.h" #include "virterror_internal.h"
#include "datatypes.h" #include "datatypes.h"
#include "viralloc.h" #include "viralloc.h"
#include "xml.h" #include "virxml.h"
#include "viruuid.h" #include "viruuid.h"
#include "virutil.h" #include "virutil.h"
#include "virbuffer.h" #include "virbuffer.h"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "snapshot_conf.h" #include "snapshot_conf.h"
#include "viralloc.h" #include "viralloc.h"
#include "verify.h" #include "verify.h"
#include "xml.h" #include "virxml.h"
#include "viruuid.h" #include "viruuid.h"
#include "virutil.h" #include "virutil.h"
#include "virbuffer.h" #include "virbuffer.h"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "interface_conf.h" #include "interface_conf.h"
#include "viralloc.h" #include "viralloc.h"
#include "xml.h" #include "virxml.h"
#include "viruuid.h" #include "viruuid.h"
#include "virutil.h" #include "virutil.h"
#include "virbuffer.h" #include "virbuffer.h"
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
# include "internal.h" # include "internal.h"
# include "virnetdevbandwidth.h" # include "virnetdevbandwidth.h"
# include "virbuffer.h" # include "virbuffer.h"
# include "xml.h" # include "virxml.h"
virNetDevBandwidthPtr virNetDevBandwidthParse(xmlNodePtr node, virNetDevBandwidthPtr virNetDevBandwidthParse(xmlNodePtr node,
int net_type) int net_type)
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
# include "internal.h" # include "internal.h"
# include "virnetdevvlan.h" # include "virnetdevvlan.h"
# include "virbuffer.h" # include "virbuffer.h"
# include "xml.h" # include "virxml.h"
int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def); int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def);
int virNetDevVlanFormat(virNetDevVlanPtr def, virBufferPtr buf); int virNetDevVlanFormat(virNetDevVlanPtr def, virBufferPtr buf);
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
# include "internal.h" # include "internal.h"
# include "virnetdevvportprofile.h" # include "virnetdevvportprofile.h"
# include "virbuffer.h" # include "virbuffer.h"
# include "xml.h" # include "virxml.h"
typedef enum { typedef enum {
/* generate random defaults for interfaceID/interfaceID /* generate random defaults for interfaceID/interfaceID
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "netdev_bandwidth_conf.h" #include "netdev_bandwidth_conf.h"
#include "netdev_vlan_conf.h" #include "netdev_vlan_conf.h"
#include "viralloc.h" #include "viralloc.h"
#include "xml.h" #include "virxml.h"
#include "viruuid.h" #include "viruuid.h"
#include "virutil.h" #include "virutil.h"
#include "virbuffer.h" #include "virbuffer.h"
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "node_device_conf.h" #include "node_device_conf.h"
#include "viralloc.h" #include "viralloc.h"
#include "xml.h" #include "virxml.h"
#include "virutil.h" #include "virutil.h"
#include "virbuffer.h" #include "virbuffer.h"
#include "viruuid.h" #include "viruuid.h"
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
# include "virutil.h" # include "virutil.h"
# include "virhash.h" # include "virhash.h"
# include "xml.h" # include "virxml.h"
# include "virbuffer.h" # include "virbuffer.h"
# include "virsocketaddr.h" # include "virsocketaddr.h"
# include "virmacaddr.h" # include "virmacaddr.h"
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "secret_conf.h" #include "secret_conf.h"
#include "virterror_internal.h" #include "virterror_internal.h"
#include "virutil.h" #include "virutil.h"
#include "xml.h" #include "virxml.h"
#include "viruuid.h" #include "viruuid.h"
#define VIR_FROM_THIS VIR_FROM_SECRET #define VIR_FROM_THIS VIR_FROM_SECRET
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include "viruuid.h" #include "viruuid.h"
#include "virfile.h" #include "virfile.h"
#include "virterror_internal.h" #include "virterror_internal.h"
#include "xml.h" #include "virxml.h"
#define VIR_FROM_THIS VIR_FROM_DOMAIN_SNAPSHOT #define VIR_FROM_THIS VIR_FROM_DOMAIN_SNAPSHOT
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "storage_conf.h" #include "storage_conf.h"
#include "virstoragefile.h" #include "virstoragefile.h"
#include "xml.h" #include "virxml.h"
#include "viruuid.h" #include "viruuid.h"
#include "virbuffer.h" #include "virbuffer.h"
#include "virutil.h" #include "virutil.h"
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "storage_conf.h" #include "storage_conf.h"
#include "storage_encryption_conf.h" #include "storage_encryption_conf.h"
#include "virutil.h" #include "virutil.h"
#include "xml.h" #include "virxml.h"
#include "virterror_internal.h" #include "virterror_internal.h"
#include "viruuid.h" #include "viruuid.h"
#include "virfile.h" #include "virfile.h"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "virlog.h" #include "virlog.h"
#include "viralloc.h" #include "viralloc.h"
#include "xml.h" #include "virxml.h"
#include "cpu.h" #include "cpu.h"
#include "cpu_x86.h" #include "cpu_x86.h"
#include "cpu_powerpc.h" #include "cpu_powerpc.h"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#ifndef __VIR_CPU_MAP_H__ #ifndef __VIR_CPU_MAP_H__
# define __VIR_CPU_MAP_H__ # define __VIR_CPU_MAP_H__
# include "xml.h" # include "virxml.h"
enum cpuMapElement { enum cpuMapElement {
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "virutil.h" #include "virutil.h"
#include "viruuid.h" #include "viruuid.h"
#include "vmx.h" #include "vmx.h"
#include "xml.h" #include "virxml.h"
#include "esx_vi.h" #include "esx_vi.h"
#include "esx_vi_methods.h" #include "esx_vi_methods.h"
#include "esx_util.h" #include "esx_util.h"
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include "virutil.h" #include "virutil.h"
#include "viralloc.h" #include "viralloc.h"
#include "datatypes.h" #include "datatypes.h"
#include "xml.h" #include "virxml.h"
#include "nodeinfo.h" #include "nodeinfo.h"
#include "virlog.h" #include "virlog.h"
#include "cpu/cpu.h" #include "cpu/cpu.h"
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
#include "virusb.h" #include "virusb.h"
#include "virprocess.h" #include "virprocess.h"
#include "libvirt_internal.h" #include "libvirt_internal.h"
#include "xml.h" #include "virxml.h"
#include "cpu/cpu.h" #include "cpu/cpu.h"
#include "virsysinfo.h" #include "virsysinfo.h"
#include "domain_nwfilter.h" #include "domain_nwfilter.h"
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#include "security_driver.h" #include "security_driver.h"
#include "security_apparmor.h" #include "security_apparmor.h"
#include "domain_conf.h" #include "domain_conf.h"
#include "xml.h" #include "virxml.h"
#include "viruuid.h" #include "viruuid.h"
#include "virusb.h" #include "virusb.h"
#include "virpci.h" #include "virpci.h"
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include "virstoragefile.h" #include "virstoragefile.h"
#include "vircommand.h" #include "vircommand.h"
#include "viralloc.h" #include "viralloc.h"
#include "xml.h" #include "virxml.h"
#include "virfile.h" #include "virfile.h"
#include "virlog.h" #include "virlog.h"
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include "domain_event.h" #include "domain_event.h"
#include "storage_conf.h" #include "storage_conf.h"
#include "node_device_conf.h" #include "node_device_conf.h"
#include "xml.h" #include "virxml.h"
#include "virthread.h" #include "virthread.h"
#include "virlog.h" #include "virlog.h"
#include "virfile.h" #include "virfile.h"
......
/* /*
* 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. * Copyright (C) 2005, 2007-2012 Red Hat, Inc.
* *
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "virterror_internal.h" #include "virterror_internal.h"
#include "xml.h" #include "virxml.h"
#include "virbuffer.h" #include "virbuffer.h"
#include "virutil.h" #include "virutil.h"
#include "viralloc.h" #include "viralloc.h"
......
/* /*
* 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__ #ifndef __VIR_XML_H__
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#if WITH_XEN_INOTIFY #if WITH_XEN_INOTIFY
# include "xen_inotify.h" # include "xen_inotify.h"
#endif #endif
#include "xml.h" #include "virxml.h"
#include "virutil.h" #include "virutil.h"
#include "viralloc.h" #include "viralloc.h"
#include "node_device_conf.h" #include "node_device_conf.h"
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <fcntl.h> #include <fcntl.h>
#include "internal.h" #include "internal.h"
#include "xml.h" #include "virxml.h"
#include "viralloc.h" #include "viralloc.h"
#include "virbuffer.h" #include "virbuffer.h"
#include "testutils.h" #include "testutils.h"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "internal.h" #include "internal.h"
#include "testutils.h" #include "testutils.h"
#include "xml.h" #include "virxml.h"
#include "virthread.h" #include "virthread.h"
#include "nwfilter_params.h" #include "nwfilter_params.h"
#include "nwfilter_conf.h" #include "nwfilter_conf.h"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <unistd.h> #include <unistd.h>
#include "internal.h" #include "internal.h"
#include "xml.h" #include "virxml.h"
#include "datatypes.h" #include "datatypes.h"
#include "xen/xen_driver.h" #include "xen/xen_driver.h"
#include "xen/xend_internal.h" #include "xen/xend_internal.h"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <unistd.h> #include <unistd.h>
#include "internal.h" #include "internal.h"
#include "xml.h" #include "virxml.h"
#include "virutil.h" #include "virutil.h"
#include "testutils.h" #include "testutils.h"
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <unistd.h> #include <unistd.h>
#include "internal.h" #include "internal.h"
#include "xml.h" #include "virxml.h"
#include "testutils.h" #include "testutils.h"
#include "xen/xen_hypervisor.h" #include "xen/xen_hypervisor.h"
#include "virfile.h" #include "virfile.h"
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "viralloc.h" #include "viralloc.h"
#include "virmacaddr.h" #include "virmacaddr.h"
#include "virsh-domain.h" #include "virsh-domain.h"
#include "xml.h" #include "virxml.h"
static const char * static const char *
vshDomainIOErrorToString(int error) vshDomainIOErrorToString(int error)
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include "virsh-domain-monitor.h" #include "virsh-domain-monitor.h"
#include "virterror_internal.h" #include "virterror_internal.h"
#include "virtypedparam.h" #include "virtypedparam.h"
#include "xml.h" #include "virxml.h"
/* Gnulib doesn't guarantee SA_SIGINFO support. */ /* Gnulib doesn't guarantee SA_SIGINFO support. */
#ifndef SA_SIGINFO #ifndef SA_SIGINFO
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "viralloc.h" #include "viralloc.h"
#include "virutil.h" #include "virutil.h"
#include "virsh-domain.h" #include "virsh-domain.h"
#include "xml.h" #include "virxml.h"
#include "virtypedparam.h" #include "virtypedparam.h"
#include "virjson.h" #include "virjson.h"
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "virbuffer.h" #include "virbuffer.h"
#include "viralloc.h" #include "viralloc.h"
#include "virutil.h" #include "virutil.h"
#include "xml.h" #include "virxml.h"
virInterfacePtr virInterfacePtr
vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd,
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "virbuffer.h" #include "virbuffer.h"
#include "viralloc.h" #include "viralloc.h"
#include "virutil.h" #include "virutil.h"
#include "xml.h" #include "virxml.h"
#include "conf/network_conf.h" #include "conf/network_conf.h"
virNetworkPtr virNetworkPtr
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "virbuffer.h" #include "virbuffer.h"
#include "viralloc.h" #include "viralloc.h"
#include "virutil.h" #include "virutil.h"
#include "xml.h" #include "virxml.h"
#include "conf/node_device_conf.h" #include "conf/node_device_conf.h"
/* /*
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "virbuffer.h" #include "virbuffer.h"
#include "viralloc.h" #include "viralloc.h"
#include "virutil.h" #include "virutil.h"
#include "xml.h" #include "virxml.h"
virNWFilterPtr virNWFilterPtr
vshCommandOptNWFilterBy(vshControl *ctl, const vshCmd *cmd, vshCommandOptNWFilterBy(vshControl *ctl, const vshCmd *cmd,
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "virbuffer.h" #include "virbuffer.h"
#include "viralloc.h" #include "viralloc.h"
#include "virutil.h" #include "virutil.h"
#include "xml.h" #include "virxml.h"
#include "conf/storage_conf.h" #include "conf/storage_conf.h"
virStoragePoolPtr virStoragePoolPtr
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "virbuffer.h" #include "virbuffer.h"
#include "viralloc.h" #include "viralloc.h"
#include "virutil.h" #include "virutil.h"
#include "xml.h" #include "virxml.h"
static virSecretPtr static virSecretPtr
vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name) vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name)
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "viralloc.h" #include "viralloc.h"
#include "virutil.h" #include "virutil.h"
#include "virsh-domain.h" #include "virsh-domain.h"
#include "xml.h" #include "virxml.h"
#include "conf/snapshot_conf.h" #include "conf/snapshot_conf.h"
/* Helper for snapshot-create and snapshot-create-as */ /* Helper for snapshot-create and snapshot-create-as */
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "virutil.h" #include "virutil.h"
#include "virfile.h" #include "virfile.h"
#include "virsh-pool.h" #include "virsh-pool.h"
#include "xml.h" #include "virxml.h"
virStorageVolPtr virStorageVolPtr
vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd,
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
#include "console.h" #include "console.h"
#include "virutil.h" #include "virutil.h"
#include "viralloc.h" #include "viralloc.h"
#include "xml.h" #include "virxml.h"
#include "libvirt/libvirt-qemu.h" #include "libvirt/libvirt-qemu.h"
#include "virfile.h" #include "virfile.h"
#include "configmake.h" #include "configmake.h"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册