From 3ddddd98c3096e225719f63f0836e7bb1a2291fa Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 13 Dec 2012 14:52:25 +0000 Subject: [PATCH] Rename pci.{c,h} to virpci.{c,h} --- 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} | 4 +++- src/util/{pci.h => virpci.h} | 2 ++ src/xen/xen_driver.c | 2 +- 19 files changed, 22 insertions(+), 18 deletions(-) rename src/util/{pci.c => virpci.c} (99%) rename src/util/{pci.h => virpci.h} (98%) diff --git a/po/POTFILES.in b/po/POTFILES.in index e39a4ef820..5eab6a8e2a 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 25c7cca96c..fbcb208e8f 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 85de50f384..045f05d25f 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 2265e5f3c6..90beb7eeb3 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 6f89f169d5..257a363724 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 81a11d7120..7289a720e3 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 283251a430..f928c29600 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 d97fc16582..677352de3a 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 051f0d914a..307f3e0c64 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 37e3ada129..4874062f99 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 b2678ca47e..d9699e2684 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 7084e33b61..862e59092f 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 ad43bc8493..46c92ca1f3 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 32959173fd..c466036998 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 95a78977fb..447954a44a 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 diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 123667c10a..d588e89325 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 e4009fa87e..1faed60540 100644 --- 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 -#include "pci.h" +#include "virpci.h" #include #include 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 814c24e31d..115da4eda7 100644 --- 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 94df116937..9b2fcf3eca 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" -- GitLab