[Qemu-devel] [PATCH 0/2] Build fixes

[Qemu-devel] [PATCH 0/2] Build fixes

[Juan Quintela]

Hi

This series fixes the parallel build of qemu.  I tried to get the best of
Daniel and Stefan ideas with mine.
Once there fixed an obvious fix.

Daniel, can you check that parallel build also works for you?  It works for me (TM).
Stefan, what do you think?

It avoids the recursive call for serializing dependencies.
We still need to put direct dependencies for qemu-{img,nbd,io}.o of the headers
I don't understand why the ones in rules.make are not enough.

Later, Juan.

Juan Quintela (2):
  fix parallel build
  fix type in CFLAGS name

 Makefile        |    9 ++++++---
 Makefile.target |    6 +++---
 rules.mak       |    4 ++--
 3 files changed, 11 insertions(+), 8 deletions(-)

[Qemu-devel] [PATCH 0/2] Build fixes

[Paolo Bonzini]

Two build fixes for configurations not covered by my and Anthony's testing.

Paolo

Paolo Bonzini (2):
  build: fix includes for VNC
  xen: add missing include

 Makefile.target  | 5 -----
 configure        | 7 +++----
 ui/Makefile.objs | 1 -
 xen-all.c        | 1 +
 4 files changed, 4 insertions(+), 10 deletions(-)

-- 
1.8.0.2

[Qemu-devel] [PATCH 1/2] build: fix includes for VNC

[Paolo Bonzini]

vnc-tls.h is included by vnc.h, and it includes gnutls/gnutls.h.
Hence, GnuTLS header files are needed by all files that include
vnc.h, most notably qmp.c.  Move these flags to QEMU_CFLAGS for
simplicity.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile.target  | 5 -----
 configure        | 7 +++----
 ui/Makefile.objs | 1 -
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 8bbad38..be8b8b8 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -120,11 +120,6 @@ obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o
 obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o
 LIBS+=-lz
 
-QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
-QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
-QEMU_CFLAGS += $(VNC_JPEG_CFLAGS)
-QEMU_CFLAGS += $(VNC_PNG_CFLAGS)
-
 # xen support
 obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o
 obj-$(CONFIG_NO_XEN) += xen-stub.o
diff --git a/configure b/configure
index b101d5c..14f05c7 100755
--- a/configure
+++ b/configure
@@ -1712,6 +1712,7 @@ EOF
   if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then
     vnc_tls=yes
     libs_softmmu="$vnc_tls_libs $libs_softmmu"
+    QEMU_CFLAGS="$QEMU_CFLAGS $vnc_tls_cflags"
   else
     if test "$vnc_tls" = "yes" ; then
       feature_not_found "vnc-tls"
@@ -1734,6 +1735,7 @@ EOF
   if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then
     vnc_sasl=yes
     libs_softmmu="$vnc_sasl_libs $libs_softmmu"
+    QEMU_CFLAGS="$QEMU_CFLAGS $vnc_sasl_cflags"
   else
     if test "$vnc_sasl" = "yes" ; then
       feature_not_found "vnc-sasl"
@@ -1755,6 +1757,7 @@ EOF
   if compile_prog "$vnc_jpeg_cflags" "$vnc_jpeg_libs" ; then
     vnc_jpeg=yes
     libs_softmmu="$vnc_jpeg_libs $libs_softmmu"
+    QEMU_CFLAGS="$QEMU_CFLAGS $vnc_jpeg_cflags"
   else
     if test "$vnc_jpeg" = "yes" ; then
       feature_not_found "vnc-jpeg"
@@ -3377,19 +3380,15 @@ if test "$vnc" = "yes" ; then
 fi
 if test "$vnc_tls" = "yes" ; then
   echo "CONFIG_VNC_TLS=y" >> $config_host_mak
-  echo "VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
 fi
 if test "$vnc_sasl" = "yes" ; then
   echo "CONFIG_VNC_SASL=y" >> $config_host_mak
-  echo "VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
 fi
 if test "$vnc_jpeg" = "yes" ; then
   echo "CONFIG_VNC_JPEG=y" >> $config_host_mak
-  echo "VNC_JPEG_CFLAGS=$vnc_jpeg_cflags" >> $config_host_mak
 fi
 if test "$vnc_png" = "yes" ; then
   echo "CONFIG_VNC_PNG=y" >> $config_host_mak
-  echo "VNC_PNG_CFLAGS=$vnc_png_cflags" >> $config_host_mak
 fi
 if test "$fnmatch" = "yes" ; then
   echo "CONFIG_FNMATCH=y" >> $config_host_mak
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index dc8f0e4..6768bb7 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -14,6 +14,5 @@ common-obj-$(CONFIG_CURSES) += curses.o
 common-obj-$(CONFIG_VNC) += $(vnc-obj-y)
 
 $(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS) 
-$(obj)/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
 
 $(obj)/cocoa.o: $(SRC_PATH)/$(obj)/cocoa.m
-- 
1.8.0.2

[Qemu-devel] [PATCH 2/2] xen: add missing include

[Paolo Bonzini]

xen-all needs to access CharDeviceState's filename field, so
it needs to include char/char.h.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 xen-all.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xen-all.c b/xen-all.c
index 50edaec..19bcfd1 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -16,6 +16,7 @@
 #include "hw/xen_backend.h"
 #include "qmp-commands.h"
 
+#include "char/char.h"
 #include "qemu/range.h"
 #include "sysemu/xen-mapcache.h"
 #include "trace.h"
-- 
1.8.0.2

Re: [Qemu-devel] [PATCH 0/2] Build fixes

[Markus Armbruster]

Paolo Bonzini <pbonzini@redhat.com> writes:

> Two build fixes for configurations not covered by my and Anthony's testing.

Fixes build for me, thanks!

Re: [Qemu-devel] [PATCH 0/2] Build fixes

[Peter Maydell]

On 20 December 2012 12:03, Markus Armbruster <armbru@redhat.com> wrote:
> Paolo Bonzini <pbonzini@redhat.com> writes:
>
>> Two build fixes for configurations not covered by my and Anthony's testing.
>
> Fixes build for me, thanks!

Ditto!

thanks
-- PMM

Re: [Qemu-devel] [PATCH 2/2] xen: add missing include

[Andreas Färber]

Am 20.12.2012 12:29, schrieb Paolo Bonzini:
> xen-all needs to access CharDeviceState's filename field, so
> it needs to include char/char.h.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Tested-by: Andreas Färber <afaerber@suse.de>

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH 0/2] Build fixes

[Blue Swirl]

Thanks, applied both.

On Thu, Dec 20, 2012 at 11:29 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Two build fixes for configurations not covered by my and Anthony's testing.
>
> Paolo
>
> Paolo Bonzini (2):
>   build: fix includes for VNC
>   xen: add missing include
>
>  Makefile.target  | 5 -----
>  configure        | 7 +++----
>  ui/Makefile.objs | 1 -
>  xen-all.c        | 1 +
>  4 files changed, 4 insertions(+), 10 deletions(-)
>
> --
> 1.8.0.2
>
>