summaryrefslogtreecommitdiffstats
path: root/hw/input
diff options
context:
space:
mode:
Diffstat (limited to 'hw/input')
-rw-r--r--hw/input/adb-kbd.c2
-rw-r--r--hw/input/adb-mouse.c1
-rw-r--r--hw/input/adb.c2
-rw-r--r--hw/input/hid.c3
-rw-r--r--hw/input/lm832x.c4
-rw-r--r--hw/input/milkymist-softusb.c4
-rw-r--r--hw/input/pckbd.c7
-rw-r--r--hw/input/pl050.c2
-rw-r--r--hw/input/ps2.c6
-rw-r--r--hw/input/pxa2xx_keypad.c2
-rw-r--r--hw/input/stellaris_input.c4
-rw-r--r--hw/input/tsc2005.c4
-rw-r--r--hw/input/tsc210x.c3
-rw-r--r--hw/input/vhost-user-input.c1
-rw-r--r--hw/input/virtio-input-hid.c2
-rw-r--r--hw/input/virtio-input-host.c2
-rw-r--r--hw/input/virtio-input.c2
17 files changed, 37 insertions, 14 deletions
diff --git a/hw/input/adb-kbd.c b/hw/input/adb-kbd.c
index da361f56df..0ba8207589 100644
--- a/hw/input/adb-kbd.c
+++ b/hw/input/adb-kbd.c
@@ -24,10 +24,10 @@
#include "qemu/osdep.h"
#include "hw/input/adb.h"
+#include "migration/vmstate.h"
#include "qemu/module.h"
#include "ui/input.h"
#include "hw/input/adb-keys.h"
-#include "sysemu/sysemu.h"
#include "adb-internal.h"
#include "trace.h"
diff --git a/hw/input/adb-mouse.c b/hw/input/adb-mouse.c
index 52526fddb7..aeba41bddd 100644
--- a/hw/input/adb-mouse.c
+++ b/hw/input/adb-mouse.c
@@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "ui/console.h"
#include "hw/input/adb.h"
+#include "migration/vmstate.h"
#include "qemu/module.h"
#include "adb-internal.h"
#include "trace.h"
diff --git a/hw/input/adb.c b/hw/input/adb.c
index 1446f32521..478a90fae2 100644
--- a/hw/input/adb.c
+++ b/hw/input/adb.c
@@ -24,6 +24,8 @@
#include "qemu/osdep.h"
#include "hw/input/adb.h"
+#include "hw/qdev-properties.h"
+#include "migration/vmstate.h"
#include "qemu/module.h"
#include "adb-internal.h"
diff --git a/hw/input/hid.c b/hw/input/hid.c
index aa4fb826fd..89239b5634 100644
--- a/hw/input/hid.c
+++ b/hw/input/hid.c
@@ -22,11 +22,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 "qemu/timer.h"
#include "hw/input/hid.h"
+#include "migration/vmstate.h"
#include "trace.h"
#define HID_USAGE_ERROR_ROLLOVER 0x01
diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c
index 5203da2bcf..a37eb854b9 100644
--- a/hw/input/lm832x.c
+++ b/hw/input/lm832x.c
@@ -19,10 +19,12 @@
*/
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/i2c/i2c.h"
+#include "hw/irq.h"
+#include "migration/vmstate.h"
#include "qemu/module.h"
#include "qemu/timer.h"
+#include "sysemu/reset.h"
#include "ui/console.h"
#define TYPE_LM8323 "lm8323"
diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c
index f779cd4370..67fcb3595f 100644
--- a/hw/input/milkymist-softusb.c
+++ b/hw/input/milkymist-softusb.c
@@ -23,11 +23,13 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "hw/hw.h"
#include "hw/sysbus.h"
+#include "migration/vmstate.h"
#include "trace.h"
#include "ui/console.h"
#include "hw/input/hid.h"
+#include "hw/irq.h"
+#include "hw/qdev-properties.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 47a606f5e3..f0acfd86f7 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -21,14 +21,17 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+
#include "qemu/osdep.h"
#include "qemu/log.h"
-#include "hw/hw.h"
#include "hw/isa/isa.h"
+#include "migration/vmstate.h"
#include "hw/i386/pc.h"
#include "hw/input/ps2.h"
+#include "hw/irq.h"
#include "hw/input/i8042.h"
-#include "sysemu/sysemu.h"
+#include "sysemu/reset.h"
+#include "sysemu/runstate.h"
#include "trace.h"
diff --git a/hw/input/pl050.c b/hw/input/pl050.c
index b79bf1647d..1123037b38 100644
--- a/hw/input/pl050.c
+++ b/hw/input/pl050.c
@@ -9,7 +9,9 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
+#include "migration/vmstate.h"
#include "hw/input/ps2.h"
+#include "hw/irq.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index d3161f1e7c..67f92f6112 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -21,13 +21,15 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+
#include "qemu/osdep.h"
#include "qemu/log.h"
-#include "hw/hw.h"
#include "hw/input/ps2.h"
+#include "migration/vmstate.h"
#include "ui/console.h"
#include "ui/input.h"
-#include "sysemu/sysemu.h"
+#include "sysemu/reset.h"
+#include "sysemu/runstate.h"
#include "trace.h"
diff --git a/hw/input/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c
index 93db9ed25b..31862a7d16 100644
--- a/hw/input/pxa2xx_keypad.c
+++ b/hw/input/pxa2xx_keypad.c
@@ -13,6 +13,8 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
+#include "hw/irq.h"
+#include "migration/vmstate.h"
#include "hw/arm/pxa.h"
#include "ui/console.h"
diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c
index 3a666d61d4..59892b07fc 100644
--- a/hw/input/stellaris_input.c
+++ b/hw/input/stellaris_input.c
@@ -6,9 +6,11 @@
*
* This code is licensed under the GPL.
*/
+
#include "qemu/osdep.h"
-#include "hw/hw.h"
#include "hw/input/gamepad.h"
+#include "hw/irq.h"
+#include "migration/vmstate.h"
#include "ui/console.h"
typedef struct {
diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c
index f82771e7a7..55d61cc843 100644
--- a/hw/input/tsc2005.c
+++ b/hw/input/tsc2005.c
@@ -20,10 +20,12 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
-#include "hw/hw.h"
#include "qemu/timer.h"
+#include "sysemu/reset.h"
#include "ui/console.h"
#include "hw/input/tsc2xxx.h"
+#include "hw/irq.h"
+#include "migration/vmstate.h"
#include "trace.h"
#define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10)))
diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c
index f94cb4683b..182d3725fc 100644
--- a/hw/input/tsc210x.c
+++ b/hw/input/tsc210x.c
@@ -23,9 +23,12 @@
#include "hw/hw.h"
#include "audio/audio.h"
#include "qemu/timer.h"
+#include "sysemu/reset.h"
#include "ui/console.h"
#include "hw/arm/omap.h" /* For I2SCodec */
#include "hw/input/tsc2xxx.h"
+#include "hw/irq.h"
+#include "migration/vmstate.h"
#define TSC_DATA_REGISTERS_PAGE 0x0
#define TSC_CONTROL_REGISTERS_PAGE 0x1
diff --git a/hw/input/vhost-user-input.c b/hw/input/vhost-user-input.c
index 6da497b1a8..544452a234 100644
--- a/hw/input/vhost-user-input.c
+++ b/hw/input/vhost-user-input.c
@@ -9,7 +9,6 @@
#include "qapi/error.h"
#include "qemu-common.h"
-#include "hw/qdev.h"
#include "hw/virtio/virtio-input.h"
static int vhost_input_config_change(struct vhost_dev *dev)
diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
index f15a063fac..386a363a17 100644
--- a/hw/input/virtio-input-hid.c
+++ b/hw/input/virtio-input-hid.c
@@ -8,8 +8,8 @@
#include "qemu/iov.h"
#include "qemu/module.h"
-#include "hw/qdev.h"
#include "hw/virtio/virtio.h"
+#include "hw/qdev-properties.h"
#include "hw/virtio/virtio-input.h"
#undef CONFIG_CURSES
diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
index a54c31eb09..1c3b12ba32 100644
--- a/hw/input/virtio-input-host.c
+++ b/hw/input/virtio-input-host.c
@@ -9,8 +9,8 @@
#include "qemu/module.h"
#include "qemu/sockets.h"
-#include "hw/qdev.h"
#include "hw/virtio/virtio.h"
+#include "hw/qdev-properties.h"
#include "hw/virtio/virtio-input.h"
#include <sys/ioctl.h>
diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c
index 9946394cf4..51617a5885 100644
--- a/hw/input/virtio-input.c
+++ b/hw/input/virtio-input.c
@@ -10,8 +10,8 @@
#include "qemu/module.h"
#include "trace.h"
-#include "hw/qdev.h"
#include "hw/virtio/virtio.h"
+#include "hw/qdev-properties.h"
#include "hw/virtio/virtio-input.h"
#include "standard-headers/linux/input.h"