usb: 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-20-git-send-email-peter.maydell@linaro.org

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 1bbe9302f93e89d533928954e7b17a99274a5b38..4452bdbe206967c245b6c49b8c5893ecff5c65e6 100644 (file)
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/usb.h"
 #include "hw/qdev.h"

diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
index 869a63c5b7c93522b73a8ff678c3bba008f5d462..6893028ddf1525f847b5e2886d36d91d5b6b8888 100644 (file)
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -26,6 +26,7 @@
  * the db parameter.
  */
 
+#include "qemu/osdep.h"
 #include <eventt.h>
 #include <vevent.h>
 #include <vreader.h>

diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index 9f49c0537fdfee4663d5706a802d1df19490aace..2e4d95ff755d9f225227a9808c2c8ea35e48fb89 100644 (file)
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -8,6 +8,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/char.h"
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"

diff --git a/hw/usb/combined-packet.c b/hw/usb/combined-packet.c
index ad77705f8cec1d45de4e8e11ceaec2c45a22bd7a..48cac87f6a7f02e1bf5cf12da83fac7281c06870 100644 (file)
--- a/hw/usb/combined-packet.c
+++ b/hw/usb/combined-packet.c
@@ -19,6 +19,7 @@
  * 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 "qemu-common.h"
 #include "hw/usb.h"
 #include "qemu/iov.h"

diff --git a/hw/usb/core.c b/hw/usb/core.c
index d0025db60dcaf413f81ebddd8bcbd3e05c747f73..bea5e1ee8bcee692a236e06b1f602f853028fcb3 100644 (file)
--- a/hw/usb/core.c
+++ b/hw/usb/core.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 "qemu-common.h"
 #include "hw/usb.h"
 #include "qemu/iov.h"

diff --git a/hw/usb/desc-msos.c b/hw/usb/desc-msos.c
index 32c3600df8479f576496fe00d4fc99d0fc3eb03e..3652919815777d637ed4f716772f9c1ce2d0b819 100644 (file)
--- a/hw/usb/desc-msos.c
+++ b/hw/usb/desc-msos.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "hw/usb.h"
 #include "hw/usb/desc.h"
 

diff --git a/hw/usb/desc.c b/hw/usb/desc.c
index b82c397ef9e82bd3ac89228b91200bee4462ab45..adb026e43b953c35b4603a471edd6518943ccf11 100644 (file)
--- a/hw/usb/desc.c
+++ b/hw/usb/desc.c
@@ -1,4 +1,4 @@
-#include <ctype.h>
+#include "qemu/osdep.h"
 
 #include "hw/usb.h"
 #include "hw/usb/desc.h"

diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index 02fb1103c693351ec18b5a51f8aa0d72a584d658..87cab0a3d1f677777f0b31db27bfb11c4fb0982d 100644 (file)
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -29,6 +29,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/usb.h"
 #include "hw/usb/desc.h"

diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index b19ec76b007ad1050144f38ed12a50d6d4fa5107..91a4a0b8b9908d6d51620df9879c143f4f1dbd22 100644 (file)
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.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 "qemu/error-report.h"
 #include "hw/usb.h"

diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index 2e7dcd96cb2699a5fb511addcd078adcfe3f4a6b..40f38ad45eec01d33299b0dee50c2146f9a71d34 100644 (file)
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.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 "ui/console.h"
 #include "hw/usb.h"

diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index c8c685550541843ad2d703770fd0a31523eb8619..64acdb0af02be44790c09a29e596d4d79f621910 100644 (file)
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.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 "qemu-common.h"
 #include "trace.h"
 #include "hw/usb.h"

diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 4177a87ea2ec4235485dec9ceb7d91db6fd7f381..7391783193a0e8c0f04b82b9ff9800b2fa8da715 100644 (file)
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -9,11 +9,10 @@
  * This code is licensed under the GPL v2 or later.
  */
 
+#include "qemu/osdep.h"
 #include <wchar.h>
 #include <dirent.h>
-#include <unistd.h>
 
-#include <sys/stat.h>
 #include <sys/statvfs.h>
 #ifdef __linux__
 #include <sys/inotify.h>

diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index 7800ceea5b454b20d9cb3fa6bf2a709b3ddbd3a7..985a6298bf857afa33fb55297d39cf4724732686 100644 (file)
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/usb.h"
 #include "hw/usb/desc.h"

diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index a6a66008ec35c1ffd5a06128a060ed25e1811711..afad1db8b3898e9b56d1b10522e6cb05604d6f7a 100644 (file)
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -8,6 +8,7 @@
  * This code is licensed under the LGPL.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "hw/usb.h"

diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 8952efffa42984ad36642a3b55c2554c7cf60c5e..96a1a138126b061d370bacd3932dd9fd467f82d0 100644 (file)
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -34,6 +34,7 @@
  *  Not sure which messages trigger this.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "hw/usb.h"

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 597d8fd18455958f1b46ddd5c6e0e6d58321d287..f7ab741a5b3deba521d8776deff3bc0c99926548 100644 (file)
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -7,6 +7,7 @@
  * This code is licensed under the LGPL.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"

diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c
index 38b26c586d3ca06add6e744db3706231a99ddc87..0678b1b05bb21bbc7998f4a1ac82437a4139e276 100644 (file)
--- a/hw/usb/dev-uas.c
+++ b/hw/usb/dev-uas.c
@@ -9,6 +9,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"

diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c
index c2450e7297990b8ee67539ffa5360a00cef547c0..c4702dbba098abcec3798f3731c271289abc788f 100644 (file)
--- a/hw/usb/dev-wacom.c
+++ b/hw/usb/dev-wacom.c
@@ -25,6 +25,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 "ui/console.h"
 #include "hw/usb.h"

diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c
index 16fb845d0705d44ef1aa680eb634c253ef75cbec..56577051e2bebde93aea578d3ff43c7badd2579b 100644 (file)
--- a/hw/usb/hcd-ehci-pci.c
+++ b/hw/usb/hcd-ehci-pci.c
@@ -15,6 +15,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/usb/hcd-ehci.h"
 #include "qemu/range.h"
 

diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c
index cd1cc142ab17c06e3c14aa699c42d7475a2c3efc..6c20604d07497bc0c8066c226f3874f07670bf2a 100644 (file)
--- a/hw/usb/hcd-ehci-sysbus.c
+++ b/hw/usb/hcd-ehci-sysbus.c
@@ -15,6 +15,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/usb/hcd-ehci.h"
 
 static const VMStateDescription vmstate_ehci_sysbus = {

diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index d07f228df8c64932dddaaf3d318c2a49f2459320..ab002680c7ec5708ae42e53e4460ba374952e6d2 100644 (file)
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -27,6 +27,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "hw/usb/ehci-regs.h"
 #include "hw/usb/hcd-ehci.h"
 #include "trace.h"

diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c
index 61cc87894e477fe73e6f8a432d02e4a34f93104d..cd2319735f81eea9bc867d0ddce262695dbb88a8 100644 (file)
--- a/hw/usb/hcd-musb.c
+++ b/hw/usb/hcd-musb.c
@@ -20,6 +20,7 @@
  *
  * Only host-mode and non-DMA accesses are currently supported.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"

diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index efeaf7371f45363bbe3f6cdda490704265fc644d..bed55dda78cededf64b6a232355ad13e5493c926 100644 (file)
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -25,6 +25,7 @@
  *  o BIOS work to boot from USB storage
 */
 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"

diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index 3f0ed62689cd9a446456104c5aa9f61f6643757d..5ccfb8395ab9a14bbeeb2ced5bbef561e20d125e 100644 (file)
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -25,6 +25,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/usb.h"
 #include "hw/usb/uhci-regs.h"

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 268ab364684aa8a48ee7bb20d21eedcf9bbac1f1..44b6f8c03d87d75346b7a3dddb7ea0ac3539238d 100644 (file)
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -18,6 +18,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 "qemu/timer.h"
 #include "hw/usb.h"

diff --git a/hw/usb/host-legacy.c b/hw/usb/host-legacy.c
index 422ed9a65f6254ab74f40cefb7cdb1768c667557..3b57e21b52b4c7bf7c7c8b3b73b665f36bc11022 100644 (file)
--- a/hw/usb/host-legacy.c
+++ b/hw/usb/host-legacy.c
@@ -30,6 +30,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/usb.h"
 #include "hw/usb/host.h"

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 3f8e540bd2959185de396b580f476e382b90817a..5e7ec453d0ca5a731f53f8328c2d8d0d55a55ca2 100644 (file)
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -33,6 +33,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include <poll.h>
 #include <libusb.h>
 

diff --git a/hw/usb/host-stub.c b/hw/usb/host-stub.c
index 2eaaa83419a457b6367975b8e481fd6315fa2ff6..6ba65a1f6d6203d1b0e86a761f5a917f605beb2c 100644 (file)
--- a/hw/usb/host-stub.c
+++ b/hw/usb/host-stub.c
@@ -30,6 +30,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "hw/usb.h"

diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c
index 8df11c461fffa8c0ee3056b6543d2c67299547ff..73cdf0c97d0afa8eff820e5b1d9f5d0ae9201beb 100644 (file)
--- a/hw/usb/libhw.c
+++ b/hw/usb/libhw.c
@@ -19,6 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "hw/hw.h"
 #include "hw/usb.h"

diff --git a/hw/usb/quirks.c b/hw/usb/quirks.c
index a761a9603232e708a7630019fa65c5d9c17bb0ef..38a9c5634ad24c4ffed50e0655f8962a8ce1db76 100644 (file)
--- a/hw/usb/quirks.c
+++ b/hw/usb/quirks.c
@@ -12,6 +12,7 @@
  * (at your option) any later version.
  */
 
+#include "qemu/osdep.h"
 #include "quirks.h"
 #include "hw/usb.h"
 

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 30ff74273001ba445583ec7ba8621176d4f95b91..d0f7cb8139e978f5c88a981290edfab4500e50eb 100644 (file)
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -25,6 +25,7 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"

diff --git a/tests/usb-hcd-ehci-test.c b/tests/usb-hcd-ehci-test.c
index 75073bf24e9b913da7f1a97ddff0f6167c2b8fa1..a0f13ef40a219c52e7432db0342afbda8c76aa40 100644 (file)
--- a/tests/usb-hcd-ehci-test.c
+++ b/tests/usb-hcd-ehci-test.c
@@ -7,12 +7,10 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
-#include <stdio.h>
 #include "libqtest.h"
 #include "libqos/pci-pc.h"
-#include "qemu/osdep.h"
 #include "hw/usb/uhci-regs.h"
 #include "hw/usb/ehci-regs.h"
 #include "libqos/usb.h"

diff --git a/tests/usb-hcd-ohci-test.c b/tests/usb-hcd-ohci-test.c
index fa592d487ce7ff79346a630b7d88a29e0317fd53..efd6669c7c5835d4bc11b70bc795d287285dd400 100644 (file)
--- a/tests/usb-hcd-ohci-test.c
+++ b/tests/usb-hcd-ohci-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.h"
 #include "libqos/usb.h"
 
 

diff --git a/tests/usb-hcd-uhci-test.c b/tests/usb-hcd-uhci-test.c
index a96b71683c8ca0b2f91101f0464be1d6e275d735..71ff2ea189f5761b577d449103c131d5662707ac 100644 (file)
--- a/tests/usb-hcd-uhci-test.c
+++ b/tests/usb-hcd-uhci-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.h"
 #include "libqos/usb.h"
 #include "hw/usb/uhci-regs.h"
 

diff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c
index 56ab367316dbe233996ebc52e30713afadcc686a..7e2e212df3bc6f54a23f7cba62dfc8cb49492c3f 100644 (file)
--- a/tests/usb-hcd-xhci-test.c
+++ b/tests/usb-hcd-xhci-test.c
@@ -7,10 +7,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include <glib.h>
-#include <string.h>
 #include "libqtest.h"
-#include "qemu/osdep.h"
 #include "libqos/usb.h"