Patchwork [12/15] ui/console: Remove MouseTransformInfo from qemu/typedefs.h

login
register
mail settings
Submitter Philippe Mathieu-Daudé
Date Jan. 11, 2019, 2:08 p.m.
Message ID <20190111140857.4211-13-philmd@redhat.com>
Download mbox | patch
Permalink /patch/697739/
State New
Headers show

Comments

Philippe Mathieu-Daudé - Jan. 11, 2019, 2:08 p.m.
MouseTransformInfo is only used in "ui/console.h", there is no
need to expose it via "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(-)
Thomas Huth - Jan. 14, 2019, 8:59 a.m.
On 2019-01-11 15:08, Philippe Mathieu-Daudé wrote:
> MouseTransformInfo is only used in "ui/console.h", there is no
> need to expose it via "qemu/typedefs.h".

You also touch devices.h here ... that should be mentioned, too?

 Thomas


> 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(-)
> 
> 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 9baebe9d33..e44f1473a5 100644
> --- a/include/qemu/typedefs.h
> +++ b/include/qemu/typedefs.h
> @@ -49,7 +49,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 853fcf4eb7..b74246f0f5 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);
>  
>
Philippe Mathieu-Daudé - Jan. 14, 2019, 12:59 p.m.
On 1/14/19 9:59 AM, Thomas Huth wrote:
> On 2019-01-11 15:08, Philippe Mathieu-Daudé wrote:
>> MouseTransformInfo is only used in "ui/console.h", there is no
>> need to expose it via "qemu/typedefs.h".
> 
> You also touch devices.h here ... that should be mentioned, too?

It depends whichever of this series or 'remove "hw/devices.h"' enters
first :)

> 
>  Thomas
> 
> 
>> 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(-)
>>
>> 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 9baebe9d33..e44f1473a5 100644
>> --- a/include/qemu/typedefs.h
>> +++ b/include/qemu/typedefs.h
>> @@ -49,7 +49,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 853fcf4eb7..b74246f0f5 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);
>>  
>>
>

Patch

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 9baebe9d33..e44f1473a5 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -49,7 +49,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 853fcf4eb7..b74246f0f5 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);