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

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

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	\

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

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"

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"

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
 

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"

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"

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"
 

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"

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"

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"
 

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"

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"

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>

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;

src/util/pci.c → src/util/virpci.c

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

src/util/pci.h → src/util/virpci.h

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

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"