Rename pci.{c,h} to virpci.{c,h}

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e39a4ef820ddcc52408d8a9dd640d66998589d85..5eab6a8e2a687456f934e79557c69aa9305be887 100644 (file)
--- 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 25c7cca96ca4147c120467f379d4c5c9e12d3622..fbcb208e8f82ea08eca76be0185aaf3b9f19d03e 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/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 85de50f3842d4479bce4a1a947354355f516ffdd..045f05d25f3af97c260299d18903c2c804d1a047 100644 (file)
--- 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 2265e5f3c6a19063831a2adfe378ec456202c0fb..90beb7eeb3325204718cf9ae393ece2b796d8f6c 100644 (file)
--- 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 6f89f169d53dbee87ba0e531cc18069396bb6bd0..257a363724749a358872631de052f657a21e7eb4 100644 (file)
--- 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 81a11d7120ec32a02f0c017b1224c2cab3f9cd4d..7289a720e3f7eeedfb216f734eb1fbe7f7adad33 100644 (file)
--- 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 283251a430f252d9d3f9467842fefcf83fe9d240..f928c2960075ab4346ad1b575f435a721ec0ec60 100644 (file)
--- 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 d97fc165826e72e1af2864195c1c6b247df72e0b..677352de3a47b240e71e3330fd40e7b7ed9cfc3a 100644 (file)
--- 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 051f0d914a81b8f40acc6c434edadf5e09b571a2..307f3e0c64d5ac0ae06156abd892c6f774d92207 100644 (file)
--- 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 37e3ada129fe3a6fbe99c4b9e1290882f997373f..4874062f99a40bfa69413179ee5361af4ead0f81 100644 (file)
--- 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 b2678ca47e8302b3710c1f0cc5ac9276856dcf17..d9699e2684ecb3fe611258e51f153ad92afb4b28 100644 (file)
--- 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 7084e33b6183d98475ecc41745feb6ba5fc63cc8..862e59092f39c070b5e606fadca84f178f164171 100644 (file)
--- 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 ad43bc8493ee26786e4a207da04faa0cbb53215b..46c92ca1f3cccf6827d8258f50da6cc3e42e6b75 100644 (file)
--- 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 32959173fddc3f1bc9169bb7e65efd5313107086..c46603699889471dfd63993bd61695fa4778152f 100644 (file)
--- 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 95a78977fbefa657f390a26f61884732307cef65..447954a44ac6746f10545e7a4deddbe02ee83e64 100644 (file)
--- 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 123667c10a1de5117bde85dc30dbb6b1219e6741..d588e89325ae3b19d0369abc9ad38ac29c6e156b 100644 (file)
--- 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 e4009fa87e51a0de4e022a212e08b848d43ab935..1faed605406169b74e586fb418f64aa2ff95607d 100644 (file)
--- a/src/util/pci.c
+++ b/src/util/virpci.c
@@ -1,4 +1,6 @@
 /*
+ * virpci.c: helper APIs for managing host PCI devices
+ *
  * Copyright (C) 2009-2012 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -21,7 +23,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 98%
rename from src/util/pci.h
rename to src/util/virpci.h
index 814c24e31d5bf9134b774b19e1df9389db9c990d..115da4eda7db90991530864eb7cf241a19ef0173 100644 (file)
--- a/src/util/pci.h
+++ b/src/util/virpci.h
@@ -1,4 +1,6 @@
 /*
+ * virpci.h: helper APIs for managing host PCI devices
+ *
  * Copyright (C) 2009, 2011-2012 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 94df1169378b17f4ca84e720d1f5794b045ee252..9b2fcf3eca0cc4d54624f4886aa30f757c99d6bf 100644 (file)
--- 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"