Rename hostusb.{c,h} to virusb.{c,h}

diff --git a/po/POTFILES.in b/po/POTFILES.in
index be3f5d8b8d1c6e517b71b5ee4419463c6f9c6ab0..cc595b177911a8e048e2439bbb42b3a97339e485 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/hostusb.c
 src/util/iohelper.c
 src/util/iptables.c
 src/util/json.c
@@ -182,6 +181,7 @@ src/util/virterror_internal.h
 src/util/virtime.c
 src/util/virtypedparam.c
 src/util/viruri.c
+src/util/virusb.c
 src/util/xml.c
 src/vbox/vbox_MSCOMGlue.c
 src/vbox/vbox_XPCOMCGlue.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 5df6fff0b8e6671e6947c45786d362fa79f552bb..322998705e93ce3223708722c7470c51cbec9351 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,7 +59,6 @@ UTIL_SOURCES =                                                        \
                util/memory.c util/memory.h                     \
                util/pci.c util/pci.h                           \
                util/processinfo.c util/processinfo.h           \
-               util/hostusb.c util/hostusb.h                   \
                util/sexpr.c util/sexpr.h                       \
                util/stats_linux.c util/stats_linux.h           \
                util/storage_file.c util/storage_file.h         \
@@ -116,6 +115,7 @@ UTIL_SOURCES =                                                      \
                util/virsocketaddr.h util/virsocketaddr.c \
                util/virstring.h util/virstring.c \
                util/virtime.h util/virtime.c \
+               util/virusb.c util/virusb.h                     \
                util/viruri.h util/viruri.c
 
 EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \

diff --git a/src/lxc/lxc_cgroup.h b/src/lxc/lxc_cgroup.h
index c1d4551285a11b0d643e9cbc4374c9ec5676cfda..97b94e57253da9806ee423a87ffe3be399be1708 100644 (file)
--- a/src/lxc/lxc_cgroup.h
+++ b/src/lxc/lxc_cgroup.h
@@ -24,7 +24,7 @@
 
 # include "domain_conf.h"
 # include "lxc_fuse.h"
-# include "hostusb.h"
+# include "virusb.h"
 
 int virLXCCgroupSetup(virDomainDefPtr def);
 int virLXCCgroupGetMeminfo(virLXCMeminfoPtr meminfo);

diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h
index a9c337e6aafd04855988cb7d89214b60acccfbf2..70d47a4cae770dfcc0acefe8c5f41c5ace4824fb 100644 (file)
--- a/src/lxc/lxc_conf.h
+++ b/src/lxc/lxc_conf.h
@@ -35,7 +35,7 @@
 # include "vircgroup.h"
 # include "security/security_manager.h"
 # include "configmake.h"
-# include "hostusb.h"
+# include "virusb.h"
 
 # define LXC_DRIVER_NAME "LXC"
 

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 0c4e676ba22976fd88c7f62ac440edf1bec18610..717811f3afb24f534bbcb54bbbda3f4ec0709c7c 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -61,7 +61,7 @@
 #include "virnetdevveth.h"
 #include "uuid.h"
 #include "virfile.h"
-#include "hostusb.h"
+#include "virusb.h"
 #include "vircommand.h"
 #include "virnetdev.h"
 #include "virprocess.h"

diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h
index e212581bb7ad089fe01c343e6d74a8e535607622..75ef514a3b84a905f5e4bbb27c5c910dda20dafd 100644 (file)
--- a/src/qemu/qemu_cgroup.h
+++ b/src/qemu/qemu_cgroup.h
@@ -24,7 +24,7 @@
 #ifndef __QEMU_CGROUP_H__
 # define __QEMU_CGROUP_H__
 
-# include "hostusb.h"
+# include "virusb.h"
 # include "domain_conf.h"
 # include "qemu_conf.h"
 

diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 5499203272771d3b4edd77ffc562902b1867881f..283251a430f252d9d3f9467842fefcf83fe9d240 100644 (file)
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -36,7 +36,7 @@
 # include "security/security_manager.h"
 # include "vircgroup.h"
 # include "pci.h"
-# include "hostusb.h"
+# include "virusb.h"
 # include "cpu_conf.h"
 # include "driver.h"
 # include "virbitmap.h"

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a499cb51af80f8aced49fd03b857490438734d01..477c20883444403a0d2cc1369fccce4bcfdc8fea 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -72,7 +72,7 @@
 #include "domain_audit.h"
 #include "node_device_conf.h"
 #include "pci.h"
-#include "hostusb.h"
+#include "virusb.h"
 #include "processinfo.h"
 #include "libvirt_internal.h"
 #include "xml.h"

diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 57c5a711604e323f4c85bd7d016eae92d35440bc..08094d1cdbf71a42bc05d0aed41dc0bc777cb758 100644 (file)
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -28,7 +28,7 @@
 #include "virterror_internal.h"
 #include "memory.h"
 #include "pci.h"
-#include "hostusb.h"
+#include "virusb.h"
 #include "virnetdev.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU

diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index fff1bdcdee41b1378f48cc4e5bc1b7de3a79a52a..2b3a2e20fc5535561b3d27e4365382b85fac62f6 100644 (file)
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -44,7 +44,7 @@
 #include "datatypes.h"
 #include "uuid.h"
 #include "pci.h"
-#include "hostusb.h"
+#include "virusb.h"
 #include "virfile.h"
 #include "configmake.h"
 #include "vircommand.h"

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 2861725cdb7637d79f4f75652a68890174f9885b..8ad61d74a9fbcaad58a7107c79503788ed406075 100644 (file)
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -29,7 +29,7 @@
 #include "memory.h"
 #include "logging.h"
 #include "pci.h"
-#include "hostusb.h"
+#include "virusb.h"
 #include "storage_file.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECURITY

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 4456a20c2c3cb94a3340d97f35a006ab63937f5f..8ac647309d02b01a180d0c436f7830a43ad7b5e1 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -38,7 +38,7 @@
 #include "memory.h"
 #include "logging.h"
 #include "pci.h"
-#include "hostusb.h"
+#include "virusb.h"
 #include "storage_file.h"
 #include "virfile.h"
 #include "virhash.h"

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 00e880ea37fe1c6f8ffaedda616b756d806a13e5..cedffbd60c808830d5506d19f2ee239836b73ed5 100644 (file)
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -50,7 +50,7 @@
 #include "domain_conf.h"
 #include "xml.h"
 #include "uuid.h"
-#include "hostusb.h"
+#include "virusb.h"
 #include "pci.h"
 #include "virfile.h"
 #include "configmake.h"

diff --git a/src/util/hostusb.c b/src/util/virusb.c
similarity index 99%
rename from src/util/hostusb.c
rename to src/util/virusb.c
index 2eb80a069740c4097856139f07b7755da739dd77..c1413850d267dec6e1d36ef86ce2ec9d9a96b6bb 100644 (file)
--- a/src/util/hostusb.c
+++ b/src/util/virusb.c
@@ -1,4 +1,6 @@
 /*
+ * virusb.c: helper APIs for managing host USB devices
+ *
  * Copyright (C) 2009-2012 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -31,7 +33,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "hostusb.h"
+#include "virusb.h"
 #include "logging.h"
 #include "memory.h"
 #include "util.h"

diff --git a/src/util/hostusb.h b/src/util/virusb.h
similarity index 98%
rename from src/util/hostusb.h
rename to src/util/virusb.h
index ad2476d8abf1849e10c57971de7d17c9581dc245..917dd15c0bc93c77fdef653136b60f851cc7fea0 100644 (file)
--- a/src/util/hostusb.h
+++ b/src/util/virusb.h
@@ -1,4 +1,6 @@
 /*
+ * virusb.h: helper APIs for managing host USB devices
+ *
  * Copyright (C) 2009 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or