summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2019-01-14 14:08:28 +0100
committerThomas Huth2019-01-22 05:14:33 +0100
commit5a4c2e5905c05391a3374f75de582148394fd195 (patch)
treeee259637a4391649368d23f3ef8469db63ea63e7 /include
parentui/console: Remove DisplayState/DisplaySurface from "qemu/typedefs.h" (diff)
downloadqemu-5a4c2e5905c05391a3374f75de582148394fd195.tar.gz
qemu-5a4c2e5905c05391a3374f75de582148394fd195.tar.xz
qemu-5a4c2e5905c05391a3374f75de582148394fd195.zip
ui/console: Remove MouseTransformInfo from qemu/typedefs.h
Header files requiring MouseTransformInfo already include "ui/console.h". To clean "qemu/typedefs.h", move the declaration to "ui/console.h" (removing the forward declaration). Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/hw/devices.h1
-rw-r--r--include/qemu/typedefs.h1
-rw-r--r--include/ui/console.h4
3 files changed, 3 insertions, 3 deletions
diff --git a/include/hw/devices.h b/include/hw/devices.h
index 0e27feb0c2..b5f1662225 100644
--- a/include/hw/devices.h
+++ b/include/hw/devices.h
@@ -4,6 +4,7 @@
/* Devices that have nowhere better to go. */
#include "hw/hw.h"
+#include "ui/console.h"
/* smc91c111.c */
void smc91c111_init(NICInfo *, uint32_t, qemu_irq);
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 3a57dfd98e..38ec1fd38f 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -51,7 +51,6 @@ typedef struct MigrationIncomingState MigrationIncomingState;
typedef struct MigrationState MigrationState;
typedef struct Monitor Monitor;
typedef struct MonitorDef MonitorDef;
-typedef struct MouseTransformInfo MouseTransformInfo;
typedef struct MSIMessage MSIMessage;
typedef struct NetClientState NetClientState;
typedef struct NetFilterState NetFilterState;
diff --git a/include/ui/console.h b/include/ui/console.h
index 0a190370ac..aa9f975544 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -65,13 +65,13 @@ void qemu_remove_led_event_handler(QEMUPutLEDEntry *entry);
void kbd_put_ledstate(int ledstate);
-struct MouseTransformInfo {
+typedef struct MouseTransformInfo {
/* Touchscreen resolution */
int x;
int y;
/* Calibration values as used/generated by tslib */
int a[7];
-};
+} MouseTransformInfo;
void hmp_mouse_set(Monitor *mon, const QDict *qdict);