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

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$$)
 

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"

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

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		\

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 */

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"

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"

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"
 

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"

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"
 

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"

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);

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"
 

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
 

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"
 

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"
 

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"

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"

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"

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"
 

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"

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"

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"

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

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

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"

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);

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

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"

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

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"

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
 

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"

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"
 

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)

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"

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"

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
 

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"

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"
 

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

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
 

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"

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"

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.
  *

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"

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"

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"
 

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"

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

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"
 

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"

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"

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"

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"

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"
 

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) {

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)

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"

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"
 

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"