ide: 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 <peter.maydell@linaro.org>
Message-id: 1453832250-766-17-git-send-email-peter.maydell@linaro.org

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 17f1cbd930a3edc25b876505c7d1522dccf34826..7e87b1805ecd05494418c102cf912ae33ddd2cab 100644 (file)
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -21,6 +21,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <hw/hw.h>
 #include <hw/pci/msi.h>
 #include <hw/i386/pc.h>

diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 272ab90c7aa166f2c083da7528a5c9f80d7490fc..1fe58ab7fd32ba827639b9d9a574b19a6bade1d3 100644 (file)
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/ide/internal.h"
 #include "hw/scsi/scsi.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 27f3da21a72cf70f4e5f9091a1ddf7cbf8ad8192..49294a5314d15ff60bb1474ddec34c8ef058c026 100644 (file)
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -22,6 +22,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/i386/pc.h>
 #include <hw/pci/pci.h>

diff --git a/hw/ide/core.c b/hw/ide/core.c
index da3baab1eb5b9e5790329c6b1b3a00aa42d65713..4c46453e270fdae2a43e740597fc65182992bdd7 100644 (file)
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -22,6 +22,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/i386/pc.h>
 #include <hw/pci/pci.h>

diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 16925fa25889271de393b031d9193fb4f2132fc9..0a13334baa09e8f6e9c836fdf9ac4818cfc22bfd 100644 (file)
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -60,6 +60,7 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include <hw/hw.h>
 #include <hw/pci/msi.h>
 #include <hw/i386/pc.h>

diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 9f80503faae88c61b89ab9d04ab2c88a36117aac..eba567c8772b8842e08dbf4e0865afc06e7c0c0d 100644 (file)
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -22,6 +22,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/i386/pc.h>
 #include <hw/isa/isa.h>

diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index d4031b65e489c7dc31678e8ecf55b780f1125de0..336784b076de01b768965bf86392df024b5dde53 100644 (file)
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -22,6 +22,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/ppc/mac.h"
 #include "hw/ppc/mac_dbdma.h"

diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 6639dd4886944e8ce8b7e57efe25f1bd34816593..5c9db8047de0272eeea6b1d1efeb295fbdcd2d9a 100644 (file)
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -22,6 +22,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/i386/pc.h>
 #include <hw/pcmcia.h>

diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index b6ce62ac5aa6eaf0bb33bcd2d74d8b76b629d64e..493f65a1d0e2b74ddf305275047788d79e5c9063 100644 (file)
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -22,6 +22,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/sysbus.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 37dbc291dab210df26b259cddf0445df6f7851a4..fa5b63bc3f94153ed36638b0228639659626cb1c 100644 (file)
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -22,6 +22,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/i386/pc.h>
 #include <hw/pci/pci.h>

diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 5a26c86a8a15f203445887a64ec77b9ca2c65401..df46147c652edd1feea788b6533c92c6b8dd0685 100644 (file)
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include <hw/hw.h>
 #include <hw/i386/pc.h>
 #include <hw/pci/pci.h>

diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index fea54256adcba38151b03c76c2e21b336a4c609d..21607d99b9248f341241e946a6f71bacc129fda9 100644 (file)
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -16,6 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
+#include "qemu/osdep.h"
 #include <hw/hw.h>
 #include "sysemu/dma.h"
 #include "qemu/error-report.h"

diff --git a/hw/ide/via.c b/hw/ide/via.c
index e2da9ef71adceb593797d6e7c0c8f78d04e5c362..d3f72267a13091a67cd0d93b10092e3894062368 100644 (file)
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -23,6 +23,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/i386/pc.h>
 #include <hw/pci/pci.h>

diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 31fb1f947610cc860c3c2440e005eacdf08d2c43..6869f7f46d9531b4d98912bc728fee54902d0c06 100644 (file)
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -22,9 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include <getopt.h>
 #include <glib.h>
 

diff --git a/tests/ide-test.c b/tests/ide-test.c
index b864701356a5980941add909f148a80a1a474162..0d9ab4df95a28b487e1ff1ea1d61a094234ccbad 100644 (file)
--- a/tests/ide-test.c
+++ b/tests/ide-test.c
@@ -22,9 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
 
 #include <glib.h>
 

diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
index 6b8c556446578578997ba51ea9c09562852bcb6f..ac6c155c8396c0f88aa3c35907b4d85f8dd96402 100644 (file)
--- a/tests/libqos/ahci.c
+++ b/tests/libqos/ahci.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
 
 #include "libqtest.h"