From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
---
cfg.mk | 4 ++--
daemon/remote.c | 2 +-
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/fdstream.h | 2 +-
src/libvirt.c | 2 +-
src/libxl/libxl_driver.c | 2 +-
src/lxc/lxc_container.c | 2 +-
src/lxc/lxc_controller.c | 2 +-
src/lxc/lxc_process.c | 2 +-
src/network/bridge_driver.c | 2 +-
src/network/bridge_driver.h | 2 +-
src/nwfilter/nwfilter_ebiptables_driver.c | 2 +-
src/openvz/openvz_conf.c | 2 +-
src/openvz/openvz_driver.c | 2 +-
src/openvz/openvz_util.c | 2 +-
src/parallels/parallels_driver.c | 2 +-
src/parallels/parallels_utils.c | 2 +-
src/qemu/qemu_capabilities.c | 2 +-
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.h | 2 +-
src/qemu/qemu_conf.h | 2 +-
src/remote/remote_driver.c | 2 +-
src/rpc/virnetsocket.h | 2 +-
src/security/security_apparmor.c | 2 +-
src/security/virt-aa-helper.c | 2 +-
src/storage/storage_backend.h | 2 +-
src/storage/storage_backend_disk.c | 2 +-
src/storage/storage_backend_fs.c | 2 +-
src/storage/storage_backend_iscsi.c | 2 +-
src/storage/storage_backend_logical.c | 2 +-
src/storage/storage_backend_scsi.c | 2 +-
src/storage/storage_backend_sheepdog.c | 2 +-
src/uml/uml_conf.c | 2 +-
src/uml/uml_conf.h | 2 +-
src/util/dnsmasq.c | 2 +-
src/util/ebtables.c | 2 +-
src/util/hooks.c | 2 +-
src/util/iptables.c | 2 +-
src/util/pci.c | 2 +-
src/util/storage_file.c | 2 +-
src/util/sysinfo.c | 2 +-
src/util/util.c | 2 +-
src/util/{command.c => vircommand.c} | 4 ++--
src/util/{command.h => vircommand.h} | 2 +-
src/util/virfile.c | 2 +-
src/util/virnetdev.c | 2 +-
src/util/virnetdevbandwidth.c | 2 +-
src/util/virnetdevopenvswitch.c | 2 +-
src/util/virnetdevveth.c | 2 +-
src/util/virnodesuspend.c | 2 +-
src/vmware/vmware_conf.c | 2 +-
src/vmware/vmware_driver.c | 2 +-
src/xen/xen_driver.c | 2 +-
tests/commandtest.c | 2 +-
tests/networkxml2conftest.c | 2 +-
tests/reconnect.c | 2 +-
tests/statstest.c | 2 +-
tests/testutils.c | 2 +-
tests/virnettlscontexttest.c | 2 +-
tools/virsh.c | 2 +-
61 files changed, 63 insertions(+), 63 deletions(-)
rename src/util/{command.c => vircommand.c} (99%)
rename src/util/{command.h => vircommand.h} (99%)
diff --git a/cfg.mk b/cfg.mk
index 84cc942..f4431c0 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -745,7 +745,7 @@ $(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_protoco
# List all syntax-check exemptions:
exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.h$$
-_src1=libvirt|fdstream|qemu/qemu_monitor|util/(command|util)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon
+_src1=libvirt|fdstream|qemu/qemu_monitor|util/(vircommand|util)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon
exclude_file_name_regexp--sc_avoid_write = \
^(src/($(_src1))|daemon/libvirtd|tools/console|tests/(shunload|virnettlscontext)test)\.c$$
@@ -778,7 +778,7 @@ exclude_file_name_regexp--sc_prohibit_close = \
exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \
(^tests/(qemuhelp|nodeinfo)data/|\.(gif|ico|png|diff)$$)
-_src2=src/(util/command|libvirt|lxc/lxc_controller|locking/lock_daemon)
+_src2=src/(util/vircommand|libvirt|lxc/lxc_controller|locking/lock_daemon)
exclude_file_name_regexp--sc_prohibit_fork_wrappers = \
(^($(_src2)|tests/testutils|daemon/libvirtd)\.c$$)
diff --git a/daemon/remote.c b/daemon/remote.c
index d3c5c10..3cee038 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -39,7 +39,7 @@
#include "stream.h"
#include "uuid.h"
#include "libvirt/libvirt-qemu.h"
-#include "command.h"
+#include "vircommand.h"
#include "intprops.h"
#include "virnetserverservice.h"
#include "virnetserver.h"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c5f68e4..7b4567b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -138,7 +138,6 @@ src/storage/storage_driver.c
src/test/test_driver.c
src/uml/uml_conf.c
src/uml/uml_driver.c
-src/util/command.c
src/util/conf.c
src/util/dnsmasq.c
src/util/event_poll.c
@@ -158,6 +157,7 @@ src/util/viraudit.c
src/util/virauth.c
src/util/virauthconfig.c
src/util/vircgroup.c
+src/util/vircommand.c
src/util/virdbus.c
src/util/virfile.c
src/util/virhash.c
diff --git a/src/Makefile.am b/src/Makefile.am
index dfda3e7..53d1bd4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,6 @@ augeastest_DATA =
# These files are not related to driver APIs. Simply generic
# helper APIs for various purposes
UTIL_SOURCES = \
- util/command.c util/command.h \
util/conf.c util/conf.h \
util/event.c util/event.h \
util/event_poll.c util/event_poll.h \
@@ -84,6 +83,7 @@ UTIL_SOURCES = \
util/virauthconfig.c util/virauthconfig.h \
util/virbitmap.c util/virbitmap.h \
util/virbuffer.c util/virbuffer.h \
+ util/vircommand.c util/vircommand.h \
util/virfile.c util/virfile.h \
util/virnodesuspend.c util/virnodesuspend.h \
util/virobject.c util/virobject.h \
diff --git a/src/fdstream.h b/src/fdstream.h
index 65457d8..d6f5a7a 100644
--- a/src/fdstream.h
+++ b/src/fdstream.h
@@ -24,7 +24,7 @@
# define __VIR_FDSTREAM_H_
# include "internal.h"
-# include "command.h"
+# include "vircommand.h"
/* internal callback, the generic one is used up by daemon stream driver */
/* the close callback is called with fdstream private data locked */
diff --git a/src/libvirt.c b/src/libvirt.c
index 4215971..e28ed05 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -56,7 +56,7 @@
#include "intprops.h"
#include "conf.h"
#include "rpc/virnettlscontext.h"
-#include "command.h"
+#include "vircommand.h"
#include "virrandom.h"
#include "viruri.h"
#include "threads.h"
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index f4bded1..f03008f 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -38,7 +38,7 @@
#include "virfile.h"
#include "memory.h"
#include "uuid.h"
-#include "command.h"
+#include "vircommand.h"
#include "libxl.h"
#include "libxl_driver.h"
#include "libxl_conf.h"
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 37b1e33..0c4e676 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -61,8 +61,8 @@
#include "virnetdevveth.h"
#include "uuid.h"
#include "virfile.h"
-#include "command.h"
#include "hostusb.h"
+#include "vircommand.h"
#include "virnetdev.h"
#include "virprocess.h"
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 34f38c8..bfe2126 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -66,7 +66,7 @@
#include "util.h"
#include "virfile.h"
#include "virpidfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "processinfo.h"
#include "nodeinfo.h"
#include "virrandom.h"
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 5c548c2..e5f1ce2 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -42,7 +42,7 @@
#include "domain_audit.h"
#include "virterror_internal.h"
#include "logging.h"
-#include "command.h"
+#include "vircommand.h"
#include "hooks.h"
#include "lxc_hostdev.h"
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 48c047e..84098de 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -53,7 +53,7 @@
#include "virbuffer.h"
#include "virpidfile.h"
#include "util.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "uuid.h"
#include "iptables.h"
diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h
index 43fefc0..fea27e0 100644
--- a/src/network/bridge_driver.h
+++ b/src/network/bridge_driver.h
@@ -30,7 +30,7 @@
# include "internal.h"
# include "network_conf.h"
# include "domain_conf.h"
-# include "command.h"
+# include "vircommand.h"
# include "dnsmasq.h"
int networkRegister(void);
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
index 5cfc036..6966acf 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -40,7 +40,7 @@
#include "nwfilter_gentech_driver.h"
#include "nwfilter_ebiptables_driver.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "configmake.h"
#include "intprops.h"
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 30fd2e3..5448a33 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -51,7 +51,7 @@
#include "util.h"
#include "nodeinfo.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#define VIR_FROM_THIS VIR_FROM_OPENVZ
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 1e97448..9297777 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -56,7 +56,7 @@
#include "virfile.h"
#include "virtypedparam.h"
#include "logging.h"
-#include "command.h"
+#include "vircommand.h"
#include "viruri.h"
#include "stats_linux.h"
diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c
index 111045f..4163e19 100644
--- a/src/openvz/openvz_util.c
+++ b/src/openvz/openvz_util.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "virterror_internal.h"
-#include "command.h"
+#include "vircommand.h"
#include "datatypes.h"
#include "memory.h"
diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index 1e60115..6414913 100644
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -45,7 +45,7 @@
#include "memory.h"
#include "util.h"
#include "logging.h"
-#include "command.h"
+#include "vircommand.h"
#include "configmake.h"
#include "storage_file.h"
#include "nodeinfo.h"
diff --git a/src/parallels/parallels_utils.c b/src/parallels/parallels_utils.c
index 521fd97..e47ff76 100644
--- a/src/parallels/parallels_utils.c
+++ b/src/parallels/parallels_utils.c
@@ -24,7 +24,7 @@
#include <stdarg.h>
-#include "command.h"
+#include "vircommand.h"
#include "virterror_internal.h"
#include "memory.h"
#include "json.h"
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f07f6bb..98da9a4 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -34,7 +34,7 @@
#include "nodeinfo.h"
#include "cpu/cpu.h"
#include "domain_conf.h"
-#include "command.h"
+#include "vircommand.h"
#include "virbitmap.h"
#include "virnodesuspend.h"
#include "qemu_monitor.h"
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 700b0ac..3457852 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -26,7 +26,7 @@
# include "virobject.h"
# include "capabilities.h"
-# include "command.h"
+# include "vircommand.h"
# include "virobject.h"
# include "qemu_monitor.h"
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index d2fe215..e15830a 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -25,7 +25,7 @@
# define __QEMU_COMMAND_H__
# include "domain_conf.h"
-# include "command.h"
+# include "vircommand.h"
# include "capabilities.h"
# include "qemu_conf.h"
# include "qemu_domain.h"
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index bcf21c3..eafaf9f 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -40,7 +40,7 @@
# include "cpu_conf.h"
# include "driver.h"
# include "virbitmap.h"
-# include "command.h"
+# include "vircommand.h"
# include "threadpool.h"
# include "locking/lock_manager.h"
# include "qemu_capabilities.h"
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index f32e88e..8b77e7d 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -41,7 +41,7 @@
#include "memory.h"
#include "util.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "intprops.h"
#include "virtypedparam.h"
#include "viruri.h"
diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index e024640..fcd54dd 100644
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -25,7 +25,7 @@
# define __VIR_NET_SOCKET_H__
# include "virsocketaddr.h"
-# include "command.h"
+# include "vircommand.h"
# include "virnettlscontext.h"
# include "virobject.h"
# ifdef HAVE_SASL
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index f57b81f..fff1bdc 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -47,7 +47,7 @@
#include "hostusb.h"
#include "virfile.h"
#include "configmake.h"
-#include "command.h"
+#include "vircommand.h"
#include "logging.h"
#define VIR_FROM_THIS VIR_FROM_SECURITY
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 5cfc87c..03ce4fe 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -43,7 +43,7 @@
#include "virbuffer.h"
#include "util.h"
#include "memory.h"
-#include "command.h"
+#include "vircommand.h"
#include "security_driver.h"
#include "security_apparmor.h"
diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h
index c991015..56b6797 100644
--- a/src/storage/storage_backend.h
+++ b/src/storage/storage_backend.h
@@ -26,7 +26,7 @@
# include "internal.h"
# include "storage_conf.h"
-# include "command.h"
+# include "vircommand.h"
typedef char * (*virStorageBackendFindPoolSources)(virConnectPtr conn, const char *srcSpec, unsigned int flags);
typedef int (*virStorageBackendCheckPool)(virConnectPtr conn, virStoragePoolObjPtr pool, bool *active);
diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index 06b5909..c6aa407 100644
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -31,7 +31,7 @@
#include "storage_backend_disk.h"
#include "util.h"
#include "memory.h"
-#include "command.h"
+#include "vircommand.h"
#include "configmake.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index fcc46b7..cdf93af 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -45,7 +45,7 @@
#include "storage_backend_fs.h"
#include "storage_conf.h"
#include "storage_file.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "xml.h"
#include "virfile.h"
diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index b080250..c468b1b 100644
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -41,7 +41,7 @@
#include "memory.h"
#include "logging.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "virrandom.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
index fd5cbd1..53e6c61 100644
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -34,7 +34,7 @@
#include "virterror_internal.h"
#include "storage_backend_logical.h"
#include "storage_conf.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "logging.h"
#include "virfile.h"
diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index 4e832eb..6515e57 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -33,7 +33,7 @@
#include "memory.h"
#include "logging.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c
index 66d8fb4..ecca7a8 100644
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -29,7 +29,7 @@
#include "virterror_internal.h"
#include "storage_backend_sheepdog.h"
#include "storage_conf.h"
-#include "util/command.h"
+#include "vircommand.h"
#include "util.h"
#include "memory.h"
#include "logging.h"
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 2bc07a9..8f72658 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -44,7 +44,7 @@
#include "logging.h"
#include "domain_nwfilter.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "virnetdevtap.h"
#include "virnodesuspend.h"
diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h
index 9bddedc..09a0305 100644
--- a/src/uml/uml_conf.h
+++ b/src/uml/uml_conf.h
@@ -31,7 +31,7 @@
# include "domain_event.h"
# include "virterror_internal.h"
# include "threads.h"
-# include "command.h"
+# include "vircommand.h"
# include "virhash.h"
# define umlDebug(fmt, ...) do {} while(0)
diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c
index dfd6034..18be2ff 100644
--- a/src/util/dnsmasq.c
+++ b/src/util/dnsmasq.c
@@ -42,7 +42,7 @@
#include "virbitmap.h"
#include "dnsmasq.h"
#include "util.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
#include "logging.h"
diff --git a/src/util/ebtables.c b/src/util/ebtables.c
index f1b2986..4b427ee 100644
--- a/src/util/ebtables.c
+++ b/src/util/ebtables.c
@@ -41,7 +41,7 @@
#include "internal.h"
#include "ebtables.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
#include "logging.h"
diff --git a/src/util/hooks.c b/src/util/hooks.c
index 8817a4e..a6c056d 100644
--- a/src/util/hooks.c
+++ b/src/util/hooks.c
@@ -37,7 +37,7 @@
#include "memory.h"
#include "virfile.h"
#include "configmake.h"
-#include "command.h"
+#include "vircommand.h"
#define VIR_FROM_THIS VIR_FROM_HOOK
diff --git a/src/util/iptables.c b/src/util/iptables.c
index 00a1c29..25253ff 100644
--- a/src/util/iptables.c
+++ b/src/util/iptables.c
@@ -39,7 +39,7 @@
#include "internal.h"
#include "iptables.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
#include "logging.h"
diff --git a/src/util/pci.c b/src/util/pci.c
index 5971764..bf46fca 100644
--- a/src/util/pci.c
+++ b/src/util/pci.c
@@ -36,7 +36,7 @@
#include "logging.h"
#include "memory.h"
-#include "command.h"
+#include "vircommand.h"
#include "virterror_internal.h"
#include "virfile.h"
diff --git a/src/util/storage_file.c b/src/util/storage_file.c
index 3f85e0e..eebf59a 100644
--- a/src/util/storage_file.c
+++ b/src/util/storage_file.c
@@ -24,7 +24,6 @@
#include <config.h>
#include "storage_file.h"
-#include <command.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
@@ -41,6 +40,7 @@
#include "logging.h"
#include "virfile.h"
#include "c-ctype.h"
+#include "vircommand.h"
#include "virhash.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c
index 6a5db80..2f5c161 100644
--- a/src/util/sysinfo.c
+++ b/src/util/sysinfo.c
@@ -35,7 +35,7 @@
#include "util.h"
#include "logging.h"
#include "memory.h"
-#include "command.h"
+#include "vircommand.h"
#define VIR_FROM_THIS VIR_FROM_SYSINFO
diff --git a/src/util/util.c b/src/util/util.c
index 422ee75..f8ba7b4 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -84,7 +84,7 @@
#include "threads.h"
#include "verify.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "nonblocking.h"
#include "passfd.h"
#include "virprocess.h"
diff --git a/src/util/command.c b/src/util/vircommand.c
similarity index 99%
rename from src/util/command.c
rename to src/util/vircommand.c
index fbd9ff8..3046658 100644
--- a/src/util/command.c
+++ b/src/util/vircommand.c
@@ -1,5 +1,5 @@
/*
- * command.c: Child command execution
+ * vircommand.c: Child command execution
*
* Copyright (C) 2010-2012 Red Hat, Inc.
*
@@ -33,7 +33,7 @@
# include <cap-ng.h>
#endif
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
#include "util.h"
diff --git a/src/util/command.h b/src/util/vircommand.h
similarity index 99%
rename from src/util/command.h
rename to src/util/vircommand.h
index 6c8ab49..4c88165 100644
--- a/src/util/command.h
+++ b/src/util/vircommand.h
@@ -1,5 +1,5 @@
/*
- * command.h: Child command execution
+ * vircommand.h: Child command execution
*
* Copyright (C) 2010-2011 Red Hat, Inc.
*
diff --git a/src/util/virfile.c b/src/util/virfile.c
index c79ef04..d77b726 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -37,7 +37,7 @@
# include <sys/ioctl.h>
#endif
-#include "command.h"
+#include "vircommand.h"
#include "configmake.h"
#include "memory.h"
#include "virterror_internal.h"
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index c345013..e98a2ca 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -26,7 +26,7 @@
#include "virmacaddr.h"
#include "virfile.h"
#include "virterror_internal.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "pci.h"
#include "logging.h"
diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index 19c00b6..bd75a9d 100644
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -23,7 +23,7 @@
#include <config.h>
#include "virnetdevbandwidth.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index 5bce611..983a240 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "virnetdevopenvswitch.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
#include "virmacaddr.h"
diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index 4166ee0..3261337 100644
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -28,7 +28,7 @@
#include "virnetdevveth.h"
#include "memory.h"
#include "logging.h"
-#include "command.h"
+#include "vircommand.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c
index f80920e..a34ca6a 100644
--- a/src/util/virnodesuspend.c
+++ b/src/util/virnodesuspend.c
@@ -22,7 +22,7 @@
#include <config.h>
#include "virnodesuspend.h"
-#include "command.h"
+#include "vircommand.h"
#include "threads.h"
#include "datatypes.h"
diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index bada4a5..f82fcb3 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -23,7 +23,7 @@
#include <string.h>
-#include "command.h"
+#include "vircommand.h"
#include "cpu/cpu.h"
#include "dirname.h"
#include "memory.h"
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 3e7397f..d9a1333 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -30,7 +30,7 @@
#include "memory.h"
#include "util.h"
#include "uuid.h"
-#include "command.h"
+#include "vircommand.h"
#include "vmx.h"
#include "vmware_conf.h"
#include "vmware_driver.h"
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index d2de141..d9174b6 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -62,7 +62,7 @@
#include "fdstream.h"
#include "virfile.h"
#include "viruri.h"
-#include "command.h"
+#include "vircommand.h"
#include "virnodesuspend.h"
#include "nodeinfo.h"
#include "configmake.h"
diff --git a/tests/commandtest.c b/tests/commandtest.c
index 19bf9ba..f76bc54 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -33,7 +33,7 @@
#include "nodeinfo.h"
#include "util.h"
#include "memory.h"
-#include "command.h"
+#include "vircommand.h"
#include "virfile.h"
#include "virpidfile.h"
#include "virterror_internal.h"
diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index 1888465..dc0e064 100644
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -11,7 +11,7 @@
#include "internal.h"
#include "testutils.h"
#include "network_conf.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "network/bridge_driver.h"
diff --git a/tests/reconnect.c b/tests/reconnect.c
index 90af830..4031360 100644
--- a/tests/reconnect.c
+++ b/tests/reconnect.c
@@ -6,7 +6,7 @@
#include "internal.h"
#include "testutils.h"
-#include "command.h"
+#include "vircommand.h"
static void errorHandler(void *userData ATTRIBUTE_UNUSED,
virErrorPtr error ATTRIBUTE_UNUSED) {
diff --git a/tests/statstest.c b/tests/statstest.c
index 8c40082..ad71bf9 100644
--- a/tests/statstest.c
+++ b/tests/statstest.c
@@ -9,7 +9,7 @@
#include "internal.h"
#include "xen/block_stats.h"
#include "testutils.h"
-#include "command.h"
+#include "vircommand.h"
static void testQuietError(void *userData ATTRIBUTE_UNUSED,
virErrorPtr error ATTRIBUTE_UNUSED)
diff --git a/tests/testutils.c b/tests/testutils.c
index e8b48e8..1315cb5 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -45,7 +45,7 @@
#include "virterror_internal.h"
#include "virbuffer.h"
#include "logging.h"
-#include "command.h"
+#include "vircommand.h"
#include "virrandom.h"
#include "dirname.h"
#include "virprocess.h"
diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index cc260e0..d421feb 100644
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -32,7 +32,7 @@
#include "memory.h"
#include "logging.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "virsocketaddr.h"
#include "gnutls_1_0_compat.h"
diff --git a/tools/virsh.c b/tools/virsh.c
index 82c03e4..07da077 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -66,7 +66,7 @@
#include "event_poll.h"
#include "configmake.h"
#include "threads.h"
-#include "command.h"
+#include "vircommand.h"
#include "virkeycode.h"
#include "virnetdevbandwidth.h"
#include "virbitmap.h"
--
1.7.11.7
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list