From 0b8fa32f551e863bb548a11394239239270dd3dc Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 23 May 2019 16:35:07 +0200 Subject: Include qemu/module.h where needed, drop it from qemu-common.h Signed-off-by: Markus Armbruster Message-Id: <20190523143508.25387-4-armbru@redhat.com> [Rebased with conflicts resolved automatically, except for hw/usb/dev-hub.c hw/misc/exynos4210_rng.c hw/misc/bcm2835_rng.c hw/misc/aspeed_scu.c hw/display/virtio-vga.c hw/arm/stm32f205_soc.c; ui/cocoa.m fixed up] --- hw/usb/bus.c | 1 + hw/usb/ccid-card-emulated.c | 1 + hw/usb/ccid-card-passthru.c | 1 + hw/usb/chipidea.c | 1 + hw/usb/dev-audio.c | 2 +- hw/usb/dev-bluetooth.c | 2 +- hw/usb/dev-hid.c | 2 ++ hw/usb/dev-hub.c | 3 ++- hw/usb/dev-mtp.c | 2 +- hw/usb/dev-network.c | 2 +- hw/usb/dev-serial.c | 2 +- hw/usb/dev-smartcard-reader.c | 1 + hw/usb/dev-storage.c | 2 +- hw/usb/dev-uas.c | 2 +- hw/usb/dev-wacom.c | 2 ++ hw/usb/hcd-ehci-pci.c | 1 + hw/usb/hcd-ehci-sysbus.c | 1 + hw/usb/hcd-ohci.c | 1 + hw/usb/hcd-uhci.c | 2 ++ hw/usb/hcd-xhci-nec.c | 1 + hw/usb/hcd-xhci.c | 2 ++ hw/usb/host-libusb.c | 2 +- hw/usb/redirect.c | 2 +- hw/usb/tusb6010.c | 3 ++- 24 files changed, 30 insertions(+), 11 deletions(-) (limited to 'hw/usb') diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 9a74dc9560..a28e9e3b33 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -4,6 +4,7 @@ #include "hw/qdev.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "trace.h" diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index 963373ba95..e20f8ed293 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -31,6 +31,7 @@ #include "qemu/thread.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #include "ccid.h" #include "qapi/error.h" diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 0a6c657228..081bcfd70a 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -13,6 +13,7 @@ #include #include "chardev/char-fe.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qemu/sockets.h" #include "ccid.h" #include "qapi/error.h" diff --git a/hw/usb/chipidea.c b/hw/usb/chipidea.c index 60d67f88b8..3dcd22ccba 100644 --- a/hw/usb/chipidea.c +++ b/hw/usb/chipidea.c @@ -13,6 +13,7 @@ #include "hw/usb/hcd-ehci.h" #include "hw/usb/chipidea.h" #include "qemu/log.h" +#include "qemu/module.h" enum { CHIPIDEA_USBx_DCIVERSION = 0x000, diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index c46d5eeb79..718ab53cbb 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -30,7 +30,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "hw/usb.h" #include "desc.h" #include "hw/hw.h" diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c index c539a1afc6..670ba32290 100644 --- a/hw/usb/dev-bluetooth.c +++ b/hw/usb/dev-bluetooth.c @@ -19,8 +19,8 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/usb.h" #include "desc.h" #include "sysemu/bt.h" diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index f9ea3033a1..62793eaf26 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -22,12 +22,14 @@ * 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" #include "desc.h" #include "qapi/error.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/input/hid.h" diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c index 2b64d6ef03..89f55dd25c 100644 --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -21,14 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/timer.h" #include "trace.h" #include "hw/usb.h" #include "desc.h" #include "qemu/error-report.h" +#include "qemu/module.h" #define MAX_PORTS 8 diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index f31fc76c01..bac085fff4 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -18,8 +18,8 @@ #include -#include "qemu-common.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "qemu/filemonitor.h" #include "trace.h" #include "hw/usb.h" diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index ffab3fabee..889069dd5a 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "hw/usb.h" #include "desc.h" #include "net/net.h" @@ -34,6 +33,7 @@ #include "qemu/config-file.h" #include "sysemu/sysemu.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "qemu/cutils.h" /*#define TRAFFIC_DEBUG*/ diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 03c3bcd240..b82f854103 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -10,9 +10,9 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/usb.h" #include "desc.h" #include "chardev/char-serial.h" diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 6b0137bb76..8d7e516fe7 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -39,6 +39,7 @@ #include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/usb.h" #include "desc.h" diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 0e4e93ef16..9ffb88ea5b 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -9,8 +9,8 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "hw/usb.h" diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index be566cad02..abd8070d0c 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -10,11 +10,11 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "trace.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "hw/usb.h" #include "desc.h" diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c index ac0bc83b52..8c43db9335 100644 --- a/hw/usb/dev-wacom.c +++ b/hw/usb/dev-wacom.c @@ -25,10 +25,12 @@ * 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" +#include "qemu/module.h" #include "desc.h" /* Interface requests */ diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index 38b24b160a..03d3a39067 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "hw/usb/hcd-ehci.h" +#include "qemu/module.h" #include "qemu/range.h" typedef struct EHCIPCIInfo { diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index 9f7f128f19..cd1f3c70a4 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -17,6 +17,7 @@ #include "qemu/osdep.h" #include "hw/usb/hcd-ehci.h" +#include "qemu/module.h" static const VMStateDescription vmstate_ehci_sysbus = { .name = "ehci-sysbus", diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index aaba090588..4f6fdbc0a7 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "qapi/error.h" +#include "qemu/module.h" #include "qemu/timer.h" #include "hw/usb.h" #include "hw/sysbus.h" diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 09df29ff9c..98bd5cf49d 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" @@ -36,6 +37,7 @@ #include "sysemu/dma.h" #include "trace.h" #include "qemu/main-loop.h" +#include "qemu/module.h" #define FRAME_TIMER_FREQ 1000 diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c index 75715a048a..e099382b24 100644 --- a/hw/usb/hcd-xhci-nec.c +++ b/hw/usb/hcd-xhci-nec.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/usb.h" +#include "qemu/module.h" #include "hw/pci/pci.h" #include "hcd-xhci.h" diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 2e9a839f2b..5894a18663 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -18,9 +18,11 @@ * 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 "qemu/module.h" #include "qemu/queue.h" #include "hw/usb.h" #include "hw/pci/pci.h" diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 4f765d7f9a..83ebc51620 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -40,9 +40,9 @@ #include #include "qapi/error.h" -#include "qemu-common.h" #include "monitor/monitor.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "trace.h" diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 7cb6b120d4..084b8f2161 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -28,12 +28,12 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qemu/iov.h" +#include "qemu/module.h" #include "chardev/char-fe.h" #include diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c index f76b59afe8..a61b0f6354 100644 --- a/hw/usb/tusb6010.c +++ b/hw/usb/tusb6010.c @@ -18,8 +18,9 @@ * 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 "qemu/module.h" #include "qemu/timer.h" #include "hw/usb.h" #include "hw/arm/omap.h" -- cgit v1.2.3