[PATCH v2 16/28] Rename pci.{c,h} to virpci.{c,h}

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>

---
 po/POTFILES.in                     | 2 +-
 src/Makefile.am                    | 2 +-
 src/conf/node_device_conf.c        | 2 +-
 src/network/bridge_driver.c        | 2 +-
 src/node_device/node_device_hal.c  | 2 +-
 src/node_device/node_device_udev.c | 2 +-
 src/qemu/qemu_conf.h               | 2 +-
 src/qemu/qemu_driver.c             | 2 +-
 src/qemu/qemu_hostdev.c            | 2 +-
 src/qemu/qemu_hotplug.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/virnetdev.c               | 2 +-
 src/util/virnetdev.h               | 2 +-
 src/util/{pci.c => virpci.c}       | 2 +-
 src/util/{pci.h => virpci.h}       | 0
 src/xen/xen_driver.c               | 2 +-
 19 files changed, 18 insertions(+), 18 deletions(-)
 rename src/util/{pci.c => virpci.c} (99%)
 rename src/util/{pci.h => virpci.h} (100%)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e39a4ef..5eab6a8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
 src/uml/uml_conf.c
 src/uml/uml_driver.c
 src/util/iohelper.c
-src/util/pci.c
 src/util/processinfo.c
 src/util/sexpr.c
 src/util/stats_linux.c
@@ -172,6 +171,7 @@ src/util/virnetdevtap.c
 src/util/virnetdevvportprofile.c
 src/util/virnetlink.c
 src/util/virnodesuspend.c
+src/util/virpci.c
 src/util/virpidfile.c
 src/util/virprocess.c
 src/util/virrandom.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 25c7cca..fbcb208 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/pci.c util/pci.h				\
 		util/processinfo.c util/processinfo.h		\
 		util/sexpr.c util/sexpr.h			\
 		util/stats_linux.c util/stats_linux.h		\
@@ -86,6 +85,7 @@ UTIL_SOURCES =							\
 		util/virjson.c util/virjson.h			\
 		util/virlog.c util/virlog.h			\
 		util/virobject.c util/virobject.h		\
+		util/virpci.c util/virpci.h			\
 		util/virpidfile.c util/virpidfile.h		\
 		util/virprocess.c util/virprocess.h		\
 		util/virtypedparam.c util/virtypedparam.h	\
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 85de50f..045f05d 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -36,7 +36,7 @@
 #include "util.h"
 #include "virbuffer.h"
 #include "uuid.h"
-#include "pci.h"
+#include "virpci.h"
 #include "virrandom.h"
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 2265e5f..90beb7e 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -61,7 +61,7 @@
 #include "virdnsmasq.h"
 #include "configmake.h"
 #include "virnetdev.h"
-#include "pci.h"
+#include "virpci.h"
 #include "virnetdevbridge.h"
 #include "virnetdevtap.h"
 #include "virnetdevvportprofile.h"
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 6f89f16..257a363 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -35,7 +35,7 @@
 #include "datatypes.h"
 #include "viralloc.h"
 #include "uuid.h"
-#include "pci.h"
+#include "virpci.h"
 #include "virlog.h"
 #include "node_device_driver.h"
 #include "virdbus.h"
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 81a11d7..7289a72 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -37,7 +37,7 @@
 #include "uuid.h"
 #include "util.h"
 #include "virbuffer.h"
-#include "pci.h"
+#include "virpci.h"
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV
 
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 283251a..f928c29 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -35,7 +35,7 @@
 # include "threads.h"
 # include "security/security_manager.h"
 # include "vircgroup.h"
-# include "pci.h"
+# include "virpci.h"
 # include "virusb.h"
 # include "cpu_conf.h"
 # include "driver.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d97fc16..677352d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -71,7 +71,7 @@
 #include "domain_conf.h"
 #include "domain_audit.h"
 #include "node_device_conf.h"
-#include "pci.h"
+#include "virpci.h"
 #include "virusb.h"
 #include "processinfo.h"
 #include "libvirt_internal.h"
diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 051f0d9..307f3e0 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -27,7 +27,7 @@
 #include "virlog.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
-#include "pci.h"
+#include "virpci.h"
 #include "virusb.h"
 #include "virnetdev.h"
 
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 37e3ada..4874062 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -36,7 +36,7 @@
 #include "datatypes.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
-#include "pci.h"
+#include "virpci.h"
 #include "virfile.h"
 #include "qemu_cgroup.h"
 #include "locking/domain_lock.h"
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index b2678ca..d9699e2 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -43,7 +43,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "uuid.h"
-#include "pci.h"
+#include "virpci.h"
 #include "virusb.h"
 #include "virfile.h"
 #include "configmake.h"
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 7084e33..862e590 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -28,7 +28,7 @@
 #include "util.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "pci.h"
+#include "virpci.h"
 #include "virusb.h"
 #include "storage_file.h"
 
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index ad43bc8..46c92ca 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -37,7 +37,7 @@
 #include "util.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "pci.h"
+#include "virpci.h"
 #include "virusb.h"
 #include "storage_file.h"
 #include "virfile.h"
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 6f73c66..81f36ba 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -51,7 +51,7 @@
 #include "xml.h"
 #include "uuid.h"
 #include "virusb.h"
-#include "pci.h"
+#include "virpci.h"
 #include "virfile.h"
 #include "configmake.h"
 #include "virrandom.h"
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 88a2e4b..3ea0e39 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -28,7 +28,7 @@
 #include "virterror_internal.h"
 #include "vircommand.h"
 #include "viralloc.h"
-#include "pci.h"
+#include "virpci.h"
 #include "virlog.h"
 
 #include <sys/ioctl.h>
diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
index 123667c..d588e89 100644
--- a/src/util/virnetdev.h
+++ b/src/util/virnetdev.h
@@ -26,7 +26,7 @@
 # include "virsocketaddr.h"
 # include "virnetlink.h"
 # include "virmacaddr.h"
-# include "pci.h"
+# include "virpci.h"
 
 int virNetDevExists(const char *brname)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
diff --git a/src/util/pci.c b/src/util/virpci.c
similarity index 99%
rename from src/util/pci.c
rename to src/util/virpci.c
index e4009fa..8875aa6 100644
--- a/src/util/pci.c
+++ b/src/util/virpci.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include "pci.h"
+#include "virpci.h"
 
 #include <dirent.h>
 #include <fcntl.h>
diff --git a/src/util/pci.h b/src/util/virpci.h
similarity index 100%
rename from src/util/pci.h
rename to src/util/virpci.h
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 94df116..9b2fcf3 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -57,7 +57,7 @@
 #include "util.h"
 #include "viralloc.h"
 #include "node_device_conf.h"
-#include "pci.h"
+#include "virpci.h"
 #include "uuid.h"
 #include "fdstream.h"
 #include "virfile.h"
-- 
1.7.11.7

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list


[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]