From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz0Dz-00042R-RF for qemu-devel@nongnu.org; Mon, 23 Jun 2014 05:07:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wz0Dz-0003wI-0S for qemu-devel@nongnu.org; Mon, 23 Jun 2014 05:07:39 -0400 Received: from [2001:4b98:dc0:45:216:3eff:fe3d:166f] (port=37161 helo=afflict.kos.to) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz0Dy-0003w9-QB for qemu-devel@nongnu.org; Mon, 23 Jun 2014 05:07:38 -0400 Date: Mon, 23 Jun 2014 12:07:36 +0300 From: Riku Voipio Message-ID: <20140623090736.GA10074@afflict.kos.to> References: <1403508500-32691-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1403508500-32691-1-git-send-email-mst@redhat.com> Subject: Re: [Qemu-devel] [PATCH] console: move chardev declarations to sysemu/char.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: Jan Kiszka , Riku Voipio , Michael Tokarev , qemu-devel@nongnu.org, Nikolay Nikolaev , Michael Roth , Gerd Hoffmann , Anthony Liguori , Stefan Weil , Antonios Motakis On Mon, Jun 23, 2014 at 10:29:07AM +0300, Michael S. Tsirkin wrote: > move generic chardev APIs to sysemu/char.h, to make them available to > callers which can not depend on the whole of ui/console.h. > This fixes a build error on systems without pixman-devel: > > ./configure --disable-tools --disable-docs --target-list=arm-linux-user > ... > pixman none > ... > make > ... > In file included from > /data/home/nchip/linaro/qemu/include/ui/console.h:4:0, > from /data/home/nchip/linaro/qemu/stubs/vc-init.c:2: > /data/home/nchip/linaro/qemu/include/ui/qemu-pixman.h:14:20: fatal > error: pixman.h: No such file or directory > #include > ^ > compilation terminated. This fix works for me, thanks. Tested-by: Riku Voipio > Reported-by: Riku Voipio > Signed-off-by: Michael S. Tsirkin > --- > include/sysemu/char.h | 5 +++++ > include/ui/console.h | 5 ----- > qemu-char.c | 1 - > stubs/vc-init.c | 2 +- > 4 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/include/sysemu/char.h b/include/sysemu/char.h > index 3b835f6..672ed39 100644 > --- a/include/sysemu/char.h > +++ b/include/sysemu/char.h > @@ -350,4 +350,9 @@ CharDriverState *qemu_chr_open_msmouse(void); > /* baum.c */ > CharDriverState *chr_baum_init(void); > > +/* console.c */ > +typedef CharDriverState *(VcHandler)(ChardevVC *vc); > + > +void register_vc_handler(VcHandler *handler); > +CharDriverState *vc_init(ChardevVC *vc); > #endif > diff --git a/include/ui/console.h b/include/ui/console.h > index edbaa9b..845526e 100644 > --- a/include/ui/console.h > +++ b/include/ui/console.h > @@ -310,11 +310,6 @@ void qemu_console_copy(QemuConsole *con, int src_x, int src_y, > DisplaySurface *qemu_console_surface(QemuConsole *con); > DisplayState *qemu_console_displaystate(QemuConsole *console); > > -typedef CharDriverState *(VcHandler)(ChardevVC *vc); > - > -CharDriverState *vc_init(ChardevVC *vc); > -void register_vc_handler(VcHandler *handler); > - > /* sdl.c */ > void sdl_display_init(DisplayState *ds, int full_screen, int no_frame); > > diff --git a/qemu-char.c b/qemu-char.c > index a52613d..e6cbafb 100644 > --- a/qemu-char.c > +++ b/qemu-char.c > @@ -23,7 +23,6 @@ > */ > #include "qemu-common.h" > #include "monitor/monitor.h" > -#include "ui/console.h" > #include "sysemu/sysemu.h" > #include "qemu/timer.h" > #include "sysemu/char.h" > diff --git a/stubs/vc-init.c b/stubs/vc-init.c > index 2af054f..308dfa0 100644 > --- a/stubs/vc-init.c > +++ b/stubs/vc-init.c > @@ -1,5 +1,5 @@ > #include "qemu-common.h" > -#include "ui/console.h" > +#include "sysemu/char.h" > > CharDriverState *vc_init(ChardevVC *vc) > { > -- > MST