[libvirt] [PATCH v2 11/28] Rename hostusb.{c,h} to virusb.{c,h}
Daniel P. Berrange
berrange at redhat.com
Wed Dec 19 11:55:31 UTC 2012
From: "Daniel P. Berrange" <berrange at redhat.com>
---
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/lxc/lxc_cgroup.h | 2 +-
src/lxc/lxc_conf.h | 2 +-
src/lxc/lxc_container.c | 2 +-
src/qemu/qemu_cgroup.h | 2 +-
src/qemu/qemu_conf.h | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_hostdev.c | 2 +-
src/security/security_apparmor.c | 2 +-
src/security/security_dac.c | 2 +-
src/security/security_selinux.c | 2 +-
src/security/virt-aa-helper.c | 2 +-
src/util/{hostusb.c => virusb.c} | 2 +-
src/util/{hostusb.h => virusb.h} | 0
15 files changed, 14 insertions(+), 14 deletions(-)
rename src/util/{hostusb.c => virusb.c} (99%)
rename src/util/{hostusb.h => virusb.h} (100%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index be3f5d8..cc595b1 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/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 5df6fff..3229987 100644
--- 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 c1d4551..97b94e5 100644
--- 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 a9c337e..70d47a4 100644
--- 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 0c4e676..717811f 100644
--- 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 e212581..75ef514 100644
--- 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 5499203..283251a 100644
--- 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 a499cb5..477c208 100644
--- 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 57c5a71..08094d1 100644
--- 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 fff1bdc..2b3a2e2 100644
--- 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 2861725..8ad61d7 100644
--- 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 4456a20..8ac6473 100644
--- 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 03ce4fe..8553e87 100644
--- 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 2eb80a0..ef7aff3 100644
--- a/src/util/hostusb.c
+++ b/src/util/virusb.c
@@ -31,7 +31,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 100%
rename from src/util/hostusb.h
rename to src/util/virusb.h
--
1.7.11.7
More information about the libvir-list
mailing list