| Message ID | 20190114130829.21790-3-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | typedefs: Remove scarcely used declarations | expand |
On Mon, Jan 14, 2019 at 02:08:28PM +0100, Philippe Mathieu-Daudé wrote: > 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). Acked-by: Gerd Hoffmann <kraxel@redhat.com> > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > include/hw/devices.h | 1 + > include/qemu/typedefs.h | 1 - > include/ui/console.h | 4 ++-- > 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 293e47ef7c..4cda7343bf 100644 > --- a/include/qemu/typedefs.h > +++ b/include/qemu/typedefs.h > @@ -47,7 +47,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); > > -- > 2.17.2 >
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 293e47ef7c..4cda7343bf 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -47,7 +47,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);
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> --- include/hw/devices.h | 1 + include/qemu/typedefs.h | 1 - include/ui/console.h | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-)