From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:33516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj1qH-00029J-AI for qemu-devel@nongnu.org; Mon, 14 Jan 2019 07:59:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj1qG-0003k3-DE for qemu-devel@nongnu.org; Mon, 14 Jan 2019 07:59:49 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:50711) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj1qG-0003iC-7W for qemu-devel@nongnu.org; Mon, 14 Jan 2019 07:59:48 -0500 Received: by mail-wm1-f65.google.com with SMTP id n190so8815483wmd.0 for ; Mon, 14 Jan 2019 04:59:48 -0800 (PST) References: <20190111140857.4211-1-philmd@redhat.com> <20190111140857.4211-13-philmd@redhat.com> <4f2bc8e2-de3b-aaac-bc4a-e3f3b013b44e@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <68960d40-1ea9-47e5-0ab4-431a337d02de@redhat.com> Date: Mon, 14 Jan 2019 13:59:44 +0100 MIME-Version: 1.0 In-Reply-To: <4f2bc8e2-de3b-aaac-bc4a-e3f3b013b44e@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 12/15] ui/console: Remove MouseTransformInfo from qemu/typedefs.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth , Paolo Bonzini , qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , qemu-block@nongnu.org, Gerd Hoffmann , Peter Maydell , Xiao Guangrong , qemu-arm@nongnu.org, Laszlo Ersek , Marcel Apfelbaum , Igor Mammedov 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é >> --- >> 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); >> >> >