From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:53645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj6Ir-0004iM-36 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 12:45:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj6Ip-00086N-Rz for qemu-devel@nongnu.org; Mon, 14 Jan 2019 12:45:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56984) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gj6Ip-00081j-HY for qemu-devel@nongnu.org; Mon, 14 Jan 2019 12:45:35 -0500 From: Thomas Huth Date: Mon, 14 Jan 2019 18:45:19 +0100 Message-Id: <1547487921-605-2-git-send-email-thuth@redhat.com> In-Reply-To: <1547487921-605-1-git-send-email-thuth@redhat.com> References: <1547487921-605-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 20/27] ui/console: Remove MouseTransformInfo from qemu/typedefs.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Li Qiang From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 Acked-by: Gerd Hoffmann Signed-off-by: Thomas Huth --- 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 0e27feb..b5f1662 100644 --- a/include/hw/devices.h +++ b/include/hw/devices.h @@ -4,6 +4,7 @@ /* Devices that have nowhere better to go. */ =20 #include "hw/hw.h" +#include "ui/console.h" =20 /* smc91c111.c */ void smc91c111_init(NICInfo *, uint32_t, qemu_irq); diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 3a57dfd..38ec1fd 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -51,7 +51,6 @@ typedef struct MigrationIncomingState MigrationIncoming= State; 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 0a19037..aa9f975 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -65,13 +65,13 @@ void qemu_remove_led_event_handler(QEMUPutLEDEntry *e= ntry); =20 void kbd_put_ledstate(int ledstate); =20 -struct MouseTransformInfo { +typedef struct MouseTransformInfo { /* Touchscreen resolution */ int x; int y; /* Calibration values as used/generated by tslib */ int a[7]; -}; +} MouseTransformInfo; =20 void hmp_mouse_set(Monitor *mon, const QDict *qdict); =20 --=20 1.8.3.1