From e532b2e0080fea57dc2b3b3e5439735792900ae6 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 26 Jan 2016 18:17:12 +0000 Subject: [PATCH] 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 Message-id: 1453832250-766-20-git-send-email-peter.maydell@linaro.org --- hw/usb/bus.c | 1 + hw/usb/ccid-card-emulated.c | 1 + hw/usb/ccid-card-passthru.c | 1 + hw/usb/combined-packet.c | 1 + hw/usb/core.c | 1 + hw/usb/desc-msos.c | 1 + hw/usb/desc.c | 2 +- hw/usb/dev-audio.c | 1 + hw/usb/dev-bluetooth.c | 1 + hw/usb/dev-hid.c | 1 + hw/usb/dev-hub.c | 1 + hw/usb/dev-mtp.c | 3 +-- hw/usb/dev-network.c | 1 + hw/usb/dev-serial.c | 1 + hw/usb/dev-smartcard-reader.c | 1 + hw/usb/dev-storage.c | 1 + hw/usb/dev-uas.c | 1 + hw/usb/dev-wacom.c | 1 + hw/usb/hcd-ehci-pci.c | 1 + hw/usb/hcd-ehci-sysbus.c | 1 + hw/usb/hcd-ehci.c | 1 + hw/usb/hcd-musb.c | 1 + hw/usb/hcd-ohci.c | 1 + hw/usb/hcd-uhci.c | 1 + hw/usb/hcd-xhci.c | 1 + hw/usb/host-legacy.c | 1 + hw/usb/host-libusb.c | 1 + hw/usb/host-stub.c | 1 + hw/usb/libhw.c | 1 + hw/usb/quirks.c | 1 + hw/usb/redirect.c | 1 + tests/usb-hcd-ehci-test.c | 4 +--- tests/usb-hcd-ohci-test.c | 3 +-- tests/usb-hcd-uhci-test.c | 3 +-- tests/usb-hcd-xhci-test.c | 3 +-- 35 files changed, 35 insertions(+), 12 deletions(-) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 1bbe9302f93e..4452bdbe2069 100644 --- 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 869a63c5b7c9..6893028ddf15 100644 --- 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 #include #include diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 9f49c0537fdf..2e4d95ff755d 100644 --- 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 ad77705f8cec..48cac87f6a7f 100644 --- 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 . */ +#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 d0025db60dca..bea5e1ee8bce 100644 --- 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 32c3600df847..365291981577 100644 --- 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 b82c397ef9e8..adb026e43b95 100644 --- a/hw/usb/desc.c +++ b/hw/usb/desc.c @@ -1,4 +1,4 @@ -#include +#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 02fb1103c693..87cab0a3d1f6 100644 --- 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 b19ec76b007a..91a4a0b8b990 100644 --- a/hw/usb/dev-bluetooth.c +++ b/hw/usb/dev-bluetooth.c @@ -18,6 +18,7 @@ * with this program; if not, see . */ +#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 2e7dcd96cb26..40f38ad45eec 100644 --- 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 c8c685550541..64acdb0af02b 100644 --- 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 4177a87ea2ec..7391783193a0 100644 --- 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 #include -#include -#include #include #ifdef __linux__ #include diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 7800ceea5b45..985a6298bf85 100644 --- 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 a6a66008ec35..afad1db8b389 100644 --- 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 8952efffa429..96a1a138126b 100644 --- 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 597d8fd18455..f7ab741a5b3d 100644 --- 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 38b26c586d3c..0678b1b05bb2 100644 --- 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 c2450e729799..c4702dbba098 100644 --- 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 16fb845d0705..56577051e2be 100644 --- 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 . */ +#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 cd1cc142ab17..6c20604d0749 100644 --- 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 . */ +#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 d07f228df8c6..ab002680c7ec 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -27,6 +27,7 @@ * along with this program; if not, see . */ +#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 61cc87894e47..cd2319735f81 100644 --- 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 efeaf7371f45..bed55dda78ce 100644 --- 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 3f0ed62689cd..5ccfb8395ab9 100644 --- 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 268ab364684a..44b6f8c03d87 100644 --- 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 . */ +#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 422ed9a65f62..3b57e21b52b4 100644 --- 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 3f8e540bd295..5e7ec453d0ca 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -33,6 +33,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include #include diff --git a/hw/usb/host-stub.c b/hw/usb/host-stub.c index 2eaaa83419a4..6ba65a1f6d62 100644 --- 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 8df11c461fff..73cdf0c97d0a 100644 --- 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 a761a9603232..38a9c5634ad2 100644 --- 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 30ff74273001..d0f7cb8139e9 100644 --- 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 75073bf24e9b..a0f13ef40a21 100644 --- 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 -#include -#include #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 fa592d487ce7..efd6669c7c58 100644 --- 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 -#include #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 a96b71683c8c..71ff2ea189f5 100644 --- 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 -#include #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 56ab367316db..7e2e212df3bc 100644 --- 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 -#include #include "libqtest.h" -#include "qemu/osdep.h" #include "libqos/usb.h"