Rename command.{c,h} to vircommand.{c,h}

diff --git a/cfg.mk b/cfg.mk
index 84cc942f63136e89f649fbda19ab1c8c5607ad2b..f4431c05900e11e1b23b2991939f80ea8f7bbe1e 100644 (file)
--- 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 d3c5c1098c7b868fdf722e755ff2fac0fca7cf47..3cee0386694345e527023140b683db865283f881 100644 (file)
--- 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 c5f68e4df2a17f2c6cacc80699ec6f1575e6aefb..7b4567bff9b144947cfdcc0a4ce677a1c95b79f5 100644 (file)
--- 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 dfda3e79e789bfca0f6dd9fb24ab60d75b9608ee..53d1bd405225bce98be5787bac149ace66b5e51a 100644 (file)
--- 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 65457d89ff7a72115cb640c6268e796d3f588546..d6f5a7a104bbfd0b38665b0b7292284153d915e8 100644 (file)
--- 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 42159715bf03fabdfe17028be4384a9c35790e3a..e28ed0546ffcfcd57a4db699ffede60627f11b3f 100644 (file)
--- 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 f4bded11fbcd00793d4760dca26ad24aa40b4597..f03008f20ea0de87a08ad73c69bf36314a20d5a5 100644 (file)
--- 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 37b1e33c1a97f4e77a5cd68b3c5fcd365b6e2250..0c4e676ba22976fd88c7f62ac440edf1bec18610 100644 (file)
--- 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 34f38c8f9ab541acb7af6cd8f598db24d7e63e37..bfe21268d05a8df679e30aa96afe634924cac883 100644 (file)
--- 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 5c548c2d45548256c501ea65b1f74c799fb1b564..e5f1ce2cb6393904001ac634311c93e62abd32a9 100644 (file)
--- 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 48c047e7c9cae37cebde63f570174e11f5557214..84098de2b7e694450eee51a637fdaaa76bf0405f 100644 (file)
--- 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 43fefc061df7c479e1a52661345bd97e82c25593..fea27e0cc5de3f5f3372e183fc825aec9d990091 100644 (file)
--- 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 5cfc0367249f2f3895c4ebffa3e583263588adb9..6966acffc24c767d1047c607fa7386d1f941f83e 100644 (file)
--- 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 30fd2e3e86ced24f91fd6ef062ffc93d329473f1..5448a331efe254fda35133d597f3fc6b498cc6f0 100644 (file)
--- 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 1e97448388d9f018e9b0b70e85be412f06d9e549..9297777d6e17279f91b11dfb51b096a4c96eb4d8 100644 (file)
--- 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 111045f4942566748ffd3386253e9e32cd86c56d..4163e196724ae01660aaf2b32d0594d8b1ec65b9 100644 (file)
--- 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 1e6011504107ef0d0765bd8e4162012c2dfb5e1b..641491398f82564203c328ab8127f246d9bd0476 100644 (file)
--- 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 521fd9739407484fc278ce1de7a16f87c11e04ad..e47ff76fc36bce8af3415bb344ef6990769b7f8d 100644 (file)
--- 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 f552078740fd9b8d50b7a7d0daad2decf675dd15..c4cf367f4a932ad4cd96665cfead3a38b3e43020 100644 (file)
--- 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 700b0ac9f2b9b95c674778bc174ac74f1d678c45..3457852ddcd3dabaf358ccb1ca5cab81385cb5a4 100644 (file)
--- 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 d2fe215c8f2c3e4c9d16cc3bc12a04f77eab3c4b..e15830a7f51f06d8f57bc9ed5b502322ef5bc695 100644 (file)
--- 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 bcf21c3ffa90c6f1f8a269cbf9943d2a32294ffe..eafaf9f47b0a9f6a4cadd9e76da976ff108cc886 100644 (file)
--- 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 f32e88ea2f63bc593fe9d687aee43107db34a584..8b77e7dfa2627fb838f796e062825e0b17cd4697 100644 (file)
--- 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 e024640af001abfdc3ab773cce54bfb8ea39c909..fcd54dd606fc999f63cb9c175b39a21225fccc68 100644 (file)
--- 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 f57b81fe3475201ca66ec1c5c7262510a5751681..fff1bdcdee41b1378f48cc4e5bc1b7de3a79a52a 100644 (file)
--- 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 9035bbcc785c2bd19f31a3ea2550668d449f1d2e..00e880ea37fe1c6f8ffaedda616b756d806a13e5 100644 (file)
--- 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 c9910157916dd0046767d705beef5dddbe16fce8..56b67973aa30e546d814af2894cd53ab49c1438d 100644 (file)
--- 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 06b5909e788c23b14a7db11af55059cda7a2ab3d..c6aa40701af8d8a81c5cc2c9a32a0a01a6387ea1 100644 (file)
--- 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 fcc46b73ec9b8a2e4d3f78b84d8fe4aa77e642ae..cdf93af0325cbe529b600fbbb2cd21b896403788 100644 (file)
--- 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 b080250c3682d274961796ff5c1c3444e6a38083..c468b1be6ee62528df7bf3c71a66e20c8f497d32 100644 (file)
--- 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 fd5cbd12d8bfa0d1592769de567749d485d852e6..53e6c6172e0431091d49e25c62887972ae36dc43 100644 (file)
--- 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 4e832eb6564733cbce6e1107be03cffdeced6a3a..6515e57f0d365385a757626cc4448a190c8fe811 100644 (file)
--- 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 66d8fb4dc3876613bf9fbd73d15935596a435e1a..ecca7a806aac112ae664684648c4dc339d608faf 100644 (file)
--- 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 2bc07a999a8e8f320f73a76bdd92233e7ef94df3..8f72658662f7cd49c8bf9665e396c09f97c3a640 100644 (file)
--- 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 9bddedcf856e8f6bff3deb6e3a199bce525a9dad..09a03058107895304a386f1c2f68e8fdccedd2b0 100644 (file)
--- 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 dfd60349cbcf9f1c4174a2a5a9da90b8aafbda7e..18be2ffb6d13c0672e886993214d68f17e84e104 100644 (file)
--- 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 f1b29865b6fe9757c2820aea1df020d28350b059..4b427eeee496d41205a8b152c10eae0e74534d1a 100644 (file)
--- 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 8817a4e0f822273de24c630aa7795c568555e929..a6c056d51e3e1ae373e83b9a32557d5f337d6f51 100644 (file)
--- 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 00a1c294dac4b7629c93a8899d4cd4db7be66eb7..25253ff2e2fe2c540c42f02df77ed48d485df871 100644 (file)
--- 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 597176435a63e20d8376f384d66e2ba35ab44ff3..bf46fca303c99c38c016b2289d1499296940c8f0 100644 (file)
--- 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 3f85e0e2d6723f939f8a7a6e0eb5cdd92c3441d8..eebf59a1da65308e3d2cf94d99e5ed4084e18dfa 100644 (file)
--- 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 6a5db802ec87901adf1d7cc56444e3bc16ab08c2..2f5c161c6c84f447cd2e7e629df70caf912e5b8a 100644 (file)
--- 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 422ee7508a8ce3855e2ba5878afdbbf8c8e27b12..f8ba7b491b8936081a68cadf9b513d5cee80274d 100644 (file)
--- 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 fbd9ff8e7df53d2c48f3c4969afd1399c087be54..3046658a2de0259534ea52e546be6112b19ef255 100644 (file)
--- 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 6c8ab49e6c02c0cf4730b7209ca095cc1ef305e6..4c8816509df412872ddd5ee4e7a8286952462ece 100644 (file)
--- 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 c79ef04a620adce8b50d8b2d4ac88afcf920f37e..d77b72661d93ea0f0455c1489899eb769f79ed51 100644 (file)
--- 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 f5f4562969f23b357e018448eac1ca15c3dc3f75..ba09891d1e6b56c106bf2900a2ed77d84dfc4846 100644 (file)
--- 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 19c00b683afddee2dbc78aef7623da761fd7ed53..bd75a9d5b2d1ea16dccadb22bdb6620272aa168b 100644 (file)
--- 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 5bce6115a37ef4ec10a5efb5d2dc779cb6094bbd..983a240654dccad77bb83fcef5b0b7c8ff3bb302 100644 (file)
--- 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 4166ee09d7f44543aef088298ac3b368aaaaf6af..3261337751d242d15a1196d854f127fd5867a579 100644 (file)
--- 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 f80920e4b7be117074fe19a410105abc5e6fc696..a34ca6a3cef138c198cdb94e8865cd6d837003b4 100644 (file)
--- 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 bada4a513b07274f9ab99d704585da1a89990a2b..f82fcb3246e83ad42acc9e4aa5d5084e77d51230 100644 (file)
--- 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 3e7397f724bb7a7d2f2f53b6ad83c176e713cfcf..d9a1333faf5154c372dfc94bb1b1336c072b7a1f 100644 (file)
--- 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 d2de141863bed8dcfaf5a8df15e64a9d80a16561..d9174b6f56eb8a043fab513fd758061bf27dcdf9 100644 (file)
--- 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 19bf9bab43cf2e265da12bc7b63bb2cfa69641a8..f76bc54f2ae0f3b682a11a27708d7a8f3b33d740 100644 (file)
--- 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 1888465eb148f229ca53daad36657f323f74561b..dc0e06478fb9cac0f9f18a38c7147772a33b89ea 100644 (file)
--- 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 90af830bd42df2fb609d086b5fe15162178ba43f..4031360fccc40af7619c1129cbbc26aa79f4722d 100644 (file)
--- 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 8c40082ec469bdcbdc96c3b7b1eb0dfdc1977e49..ad71bf91d03d7db0dcdb8fdf21bd21c9cf00c293 100644 (file)
--- 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 e8b48e86ee7f0b837dd59aab423694c51c9415d5..1315cb58aaab430d599c0a4259dcdcbdbec0d7cf 100644 (file)
--- 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 cc260e0980a184894d2e3d1143eb4d355df32c96..d421feb49d91657af3e954732b633d3e2dd49276 100644 (file)
--- 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 82c03e4a23c1c87d1d32679fdc7e196b93a57930..07da077082dc63d951f64de07d3e1726ac642fa3 100644 (file)
--- 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"