pci: Clean up includes

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Signed-off-by: Peter Maydell <[email protected]>
Message-id: 1453832250[email protected]

diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c
index 26b9b86178c31dfa7d6460559fcc811a535f6899..5df9089218e39dd48b967880175d2ec17a6a890f 100644 (file)
--- a/hw/misc/pci-testdev.c
+++ b/hw/misc/pci-testdev.c
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "qemu/event_notifier.h"
-#include "qemu/osdep.h"
 
 typedef struct PCITestDevHdr {
     uint8_t test;

diff --git a/hw/pci-bridge/i82801b11.c b/hw/pci-bridge/i82801b11.c
index 7e79bc01efd351d881da8c816ae89146a121b9e8..b143f8cb7906221fc33821069b0df9a0dc2933ab 100644 (file)
--- a/hw/pci-bridge/i82801b11.c
+++ b/hw/pci-bridge/i82801b11.c
@@ -41,6 +41,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
 
+#include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "hw/i386/ich9.h"
 

diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
index cce2fdd8e7fc8d107e6bd45548ee08de79af5040..8ac4240bb1a70d60fbfe436b226329fba1cc36a4 100644 (file)
--- a/hw/pci-bridge/ioh3420.c
+++ b/hw/pci-bridge/ioh3420.c
@@ -20,6 +20,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/pci/pci_ids.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/pcie.h"

diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
index 26aded9f00dd67d50c4c30275f342fbaf30b9c49..c9a7e2b2a3a518f02b9e8d2f377e8d876ad6cbe1 100644 (file)
--- a/hw/pci-bridge/pci_bridge_dev.c
+++ b/hw/pci-bridge/pci_bridge_dev.c
@@ -19,6 +19,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_ids.h"
 #include "hw/pci/msi.h"

diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
index bb98fb2e463c052c189a6e843082cf35ea95dadd..62fd29d891d14f3c8c2819c3af1b09ba80bcce65 100644 (file)
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -10,6 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c
index b3a647926210b5710c39d307d175fabc94fecc79..9eb3d8895f2d9a5ffe6f464f3f1be89b871cda75 100644 (file)
--- a/hw/pci-bridge/xio3130_downstream.c
+++ b/hw/pci-bridge/xio3130_downstream.c
@@ -19,6 +19,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/pci/pci_ids.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/pcie.h"

diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c
index eada5828afdab193c25985e49e860450f9dd0a76..7d255a6d5242d30afd3ce7fea8a30ac970ed1932 100644 (file)
--- a/hw/pci-bridge/xio3130_upstream.c
+++ b/hw/pci-bridge/xio3130_upstream.c
@@ -19,6 +19,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/pci/pci_ids.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/pcie.h"

diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
index 599768e2d9608df054e264abc153d6c4e7ecd057..75dee50bc34bedb7ed4f998bdcf43d77a2c465c6 100644 (file)
--- a/hw/pci-host/apb.c
+++ b/hw/pci-host/apb.c
@@ -27,6 +27,7 @@
    Ultrasparc PCI host is called the PCI Bus Module (PBM).  The APB is
    the secondary PCI bridge.  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index b47767943491840308adda9844a6cf25496d5bb3..1999ece590448094a9bdf0f2303b43c302d2316c 100644 (file)
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -37,7 +37,7 @@
  * north bridge address to pci address.
  */
 
-#include <assert.h>
+#include "qemu/osdep.h"
 
 #include "hw/hw.h"
 #include "hw/pci/pci.h"

diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c
index 9d8fb5a496c6cfd29ae5ee9ab2ea6fd23be3f22e..66055ee5cc137e0b90d86aa3dd002e3a3edff6f5 100644 (file)
--- a/hw/pci-host/gpex.c
+++ b/hw/pci-host/gpex.c
@@ -28,6 +28,7 @@
  * http://www.kernel.org/doc/Documentation/devicetree/bindings/pci/host-generic-pci.txt
  * http://www.firmware.org/1275/practice/imap/imap0_9d.pdf
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci-host/gpex.h"
 

diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index 50add34e509f4e8b6e110e5166e0dcf7bac2de12..e502bc0505ed9994fb7f071f1984b826ef650cb7 100644 (file)
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -14,6 +14,7 @@
  * (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/ppc/e500-ccsr.h"
 #include "hw/pci/pci.h"

diff --git a/hw/pci/msi.c b/hw/pci/msi.c
index c1dd5318c856767a5c58aa6e1a06a0ac872dd15b..8efa23d3760d5718ee2a9e6f89a9268eba6b5b1f 100644 (file)
--- a/hw/pci/msi.c
+++ b/hw/pci/msi.c
@@ -18,6 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/pci/msi.h"
 #include "qemu/range.h"
 

diff --git a/hw/pci/msix.c b/hw/pci/msix.c
index 64c93d83d62cfb489ce478ce44fef84271469abd..4fea7edc89cc2c4f8ba0a98609356726eea93c50 100644 (file)
--- a/hw/pci/msix.c
+++ b/hw/pci/msix.c
@@ -14,6 +14,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"

diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
index 063a7c2427add3edd9fd87e0fd7d5c6737b5f9dd..36d2c430c5be25afc13ac220370197103b5dae04 100644 (file)
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/pci-stub.c
@@ -18,6 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "qapi/qmp/qerror.h"

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 168b9cc56b69451aefa8a5d52723ed2e7923f397..d940f79de0c144cdffa76a56c3e408ba5ce91b68 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 40c97b155c19f5101820f3b256b5ffcbcde3137d..7eab9d57c5c844046b070de03a338c6e394b2b86 100644 (file)
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -29,6 +29,7 @@
  *                    VA Linux Systems Japan K.K.
  */
 
+#include "qemu/osdep.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_bus.h"
 #include "qemu/range.h"

diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c
index 49f59a5dbca9b991db4841d282464d42eca04cc2..5eaa935cb5234969a66d87d33ac0b16a807d11c1 100644 (file)
--- a/hw/pci/pci_host.c
+++ b/hw/pci/pci_host.c
@@ -18,6 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci/pci_bus.h"

diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index 0eab29d5340490adf98c8780bca5cbe044a03241..435a6cfd5774796c4d5b5ef48abf3f98b8a4a83a 100644 (file)
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -18,6 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pcie.h"

diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index 98d2c183b0c8d259966e6bdd48f421e29c93186a..a9d9d062085484e3075b2b715cabe00fc4b56d4a 100644 (file)
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -18,6 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "qapi/qmp/types.h"
 #include "monitor/monitor.h"

diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c
index d8afba863ef4a262496a221a90888cdc383e780a..dcebf57ed45ed034361018f2bc978c4d25805d13 100644 (file)
--- a/hw/pci/pcie_host.c
+++ b/hw/pci/pcie_host.c
@@ -19,6 +19,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pcie_host.h"

diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
index 40ca8d5d1788aebc67938a8578e6512abd150ab3..6432b9ac1fdc656b84c7346a3a815756ea71f26d 100644 (file)
--- a/hw/pci/pcie_port.c
+++ b/hw/pci/pcie_port.c
@@ -18,6 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/pci/pcie_port.h"
 #include "hw/hotplug.h"
 

diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c
index d34fdf3ecbb4b0d0dafb062e820a0521ac485585..aef838415f61f7e6586b7b16fada36fe408646e2 100644 (file)
--- a/hw/pci/shpc.c
+++ b/hw/pci/shpc.c
@@ -1,5 +1,5 @@
+#include "qemu/osdep.h"
 #include "qemu-common.h"
-#include <stdint.h>
 #include "qemu/range.h"
 #include "qemu/error-report.h"
 #include "hw/pci/shpc.h"

diff --git a/hw/pci/slotid_cap.c b/hw/pci/slotid_cap.c
index 1c01d346c927a87ad09849583472412182d010dc..aec1e9166da78db72119f49e6ff61ea0544f29cc 100644 (file)
--- a/hw/pci/slotid_cap.c
+++ b/hw/pci/slotid_cap.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/pci/slotid_cap.h"
 #include "hw/pci/pci.h"
 #include "qemu/error-report.h"