Skip to content

More configure/Makefile cleanups

Juan Quintela qemu-devel 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest47 patches 8 repliesIn review
  2. v246 patches 20 repliesSuperseded
  3. v120 patches 1 replySuperseded

Changes in v3 from the cover letter

- split TARGET_CONFIG and HAVE_MACHINE_BSWAP_H patch
- fix commit message oc HOST_WORDS_BIGENDIAN
- use CONFIG_AUDIO_DRIVERS again. order is important, added a comment to indicate it. Not used audio_init() suggestion, as I don't want to delay more the inclusion of this series, will take a look at that suggestion later.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/47change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION}configure cpu-exec.c dyngen-exec.h +7 more+28 -230 replies
2/47Remove SP_CFLAGS and SP_LDFLAGSconfigure+22 -130 replies
3/47target_arch2 is redefined unconditionally laterconfigure+0 -30 replies
4/47remove CONFIG_ from VNC_TLS_{LIBS, FLAGS}Makefile Makefile.target configure+5 -50 replies
5/47use same algorithm for testing andconfigure+7 -10 replies
6/47remove CONFIG_ from VNC_SASL_{LIBS, FLAGS}Makefile.target configure+4 -40 replies
7/47remove CONFIG_ from BLUEZ_{LIBS,FLAGS}Makefile Makefile.target configure+4 -40 replies
8/47make fmod also use FMOD_{LIBS,CFLAGS}Makefile Makefile.target configure+4 -40 replies
9/47make oss use OSS_LIBSMakefile.target configure+2 -20 replies
10/47move printing of config-host.mak variables to end of generationconfigure+27 -250 replies
11/47more specific config.mak can overwrote more general config.makMakefile.hw+1 -10 replies
12/47Add -static in configure if neededMakefile Makefile.target configure+2 -140 replies
13/47Rename HAVE_FDT to CONFIG_FDT and define it also in MakefileMakefile.target configure hw/petalogix_s3adsp1800_mmu.c +3 more+10 -90 replies
14/47Refactor code to remove one #ifdef CONFIG_FDThw/petalogix_s3adsp1800_mmu.c+2 -40 replies
15/47fix indententationconfigure+2 -30 replies
16/47O_LARGEFILE is already set in qemu-common.hconfigure+0 -12 replies
17/47rename HOST_BSD to CONFIG_BSDblock.c block/raw-posix.c configure +9 more+22 -220 replies
18/47define MAP_ANONYMOUS if it is not defined in qemu-common.hconfigure qemu-common.h+3 -20 replies
19/47rename HAVE_PREADV to CONFIG_PREADVconfigure posix-aio-compat.c+3 -30 replies
20/47rename HAVE_IOVEC to CONFIG_IOVECconfigure qemu-common.h+3 -30 replies
21/47rename HAVE_FNMATCH_H to CONFIG_FNMATCHacl.c configure+3 -30 replies
22/47rename HAVE_MACHINE_BSWAP_H to CONFIG_MACHINE_BSWAP_Hbswap.h configure+3 -30 replies
23/47rename HAVE_GPROF to TARGET_GPROFbsd-user/syscall.c configure linux-user/syscall.c+7 -70 replies
24/47rename HAVE_BYTESWAP_H to CONFIG_BYTESWAP_Hbswap.h configure+3 -30 replies
25/47rename DEBUG_TCG to CONFIG_DEBUG_TCGconfigure tcg/tcg.c tcg/tcg.h+3 -30 replies
26/47rename DEBUG_EXEC to CONFIG_DEBUG_EXECconfigure cpu-exec.c+4 -40 replies
27/47rename WORDS_BIGENDIAN to HOST_WORDS_BIGENDIANMakefile.target audio/audio.h bswap.h +33 more+82 -820 replies
28/47Add CONFIG_POSIXconfigure+1 -00 replies
29/47Use CONFIG_POSIX to simplify MakefileMakefile+5 -165 replies
30/47the else part of this test is obsolete We are testing for sdl = yes inside the else part of the test if sdl = yesconfigure+1 -70 replies
31/47sdl_config value was always sdl-configconfigure+10 -110 replies
32/47Calculate sdl_libs and sdl_flags and use them everywhereconfigure+9 -70 replies
33/47instead of setup sdl_x11 just add -lX11 to sdl_libsconfigure+1 -40 replies
34/47target_softmmu is undefined at that pointconfigure+1 -10 replies
35/47remove sdl_static. Just do the right thing if static is yesconfigure+12 -300 replies
36/47indent with 2 spaces sdl testsconfigure+31 -340 replies
37/47Define and use xen libs in a single placeconfigure+8 -70 replies
38/47simplify curses library selectionconfigure+5 -100 replies
39/47simplify brlapi selectionMakefile configure+11 -110 replies
40/47simplify vde libs selectionconfigure+6 -60 replies
41/47simplify fdt libs selectionMakefile.target configure+5 -80 replies
42/47test if xen is enabled only onceconfigure+1 -40 replies
43/47define ENOTSUP the same that the other errorsconfigure qemu-common.h+3 -70 replies
44/47rename NEEDS_LIBSUNMATH to CONFIG_NEEDS_LIBSUNMATHMakefile.target configure fpu/softfloat-native.h +1 more+5 -50 replies
45/47rename USE_NPTL to CONFIG_USE_NPTLbsd-user/mmap.c bsd-user/qemu.h configure +8 more+26 -300 replies
46/47Generate config-host.h from config-host.makaudio/audio.c configure create_config+84 -580 replies
47/47move on_vcpu inside proper #ifdefkvm-all.c+9 -91 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [Qemu-devel] [PATCH v3 00/47] More configure/Makefile cleanups

Hi

Changes in v3:
- split TARGET_CONFIG and HAVE_MACHINE_BSWAP_H patch
- fix commit message oc HOST_WORDS_BIGENDIAN
- use CONFIG_AUDIO_DRIVERS again. order is important, added a comment to indicate it. Not used audio_init() suggestion, as I don't want to delay more the inclusion of this series, will take a look at that suggestion later.

I answered all the comments/suggestions from previous series

Comments?

Later, Juan.
Changes for v2:
- Changes to LIBS variable are gone (will be done in a different way)
- config-host.h generated from config-host.mak
- Almost everything configurable starts with:
- TARGET_*
- HOST_*
- CONFIG_*
- don't repeat libs name, use the same libraries in detection and in Makefiles (in some cases that was not true)
- CONFIG_NOWIN32 is called CONFIG_POSIX
- sdl configuration is basically sane now
- AUDIO_DRIVERS define is gone, done in audio.c with #ifdefs AUDIO_DRIVERS was a hack that is quite complicated to generate through the Makefile.

Juan Quintela (47):
change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION}
Remove SP_CFLAGS and SP_LDFLAGS
target_arch2 is redefined unconditionally later
remove CONFIG_ from VNC_TLS_{LIBS,FLAGS}
use same algorithm for testing and
remove CONFIG_ from VNC_SASL_{LIBS,FLAGS}
remove CONFIG_ from BLUEZ_{LIBS,FLAGS}
make fmod also use FMOD_{LIBS,CFLAGS}
make oss use OSS_LIBS
move printing of config-host.mak variables to end of generation more specific config.mak can overwrote more general config.mak Add -static in configure if needed
Rename HAVE_FDT to CONFIG_FDT and define it also in Makefile Refactor code to remove one #ifdef CONFIG_FDT
fix indententation
O_LARGEFILE is already set in qemu-common.h
rename HOST_BSD to CONFIG_BSD
define MAP_ANONYMOUS if it is not defined in qemu-common.h rename HAVE_PREADV to CONFIG_PREADV
rename HAVE_IOVEC to CONFIG_IOVEC
rename HAVE_FNMATCH_H to CONFIG_FNMATCH
rename HAVE_MACHINE_BSWAP_H to CONFIG_MACHINE_BSWAP_H rename HAVE_GPROF to TARGET_GPROF
rename HAVE_BYTESWAP_H to CONFIG_BYTESWAP_H
rename DEBUG_TCG to CONFIG_DEBUG_TCG
rename DEBUG_EXEC to CONFIG_DEBUG_EXEC
rename WORDS_BIGENDIAN to HOST_WORDS_BIGENDIAN
Add CONFIG_POSIX
Use CONFIG_POSIX to simplify Makefile
the else part of this test is obsolete We are testing for sdl = yes
inside the else part of the test if sdl = yes
sdl_config value was always sdl-config
Calculate sdl_libs and sdl_flags and use them everywhere instead of setup sdl_x11 just add -lX11 to sdl_libs target_softmmu is undefined at that point
remove sdl_static. Just do the right thing if static is yes indent with 2 spaces sdl tests
Define and use xen libs in a single place
simplify curses library selection
simplify brlapi selection
simplify vde libs selection
simplify fdt libs selection
test if xen is enabled only once
define ENOTSUP the same that the other errors
rename NEEDS_LIBSUNMATH to CONFIG_NEEDS_LIBSUNMATH rename USE_NPTL to CONFIG_USE_NPTL
Generate config-host.h from config-host.mak
move on_vcpu inside proper #ifdef

 Makefile                           |   35 +---
 Makefile.hw                        |    2 +-
 Makefile.target                    |   43 ++---
 acl.c                              |    4 +-
 audio/audio.c                      |    7 +-
 audio/audio.h                      |    2 +-
 block.c                            |    4 +-
 block/raw-posix.c                  |    4 +-
 bsd-user/mmap.c                    |    2 +-
 bsd-user/qemu.h                    |    6 +-
 bsd-user/syscall.c                 |    6 +-
 bswap.h                            |   12 +-
 configure                          |  381 ++++++++++++++++--------------------
 console.c                          |    8 +-
 cpu-all.h                          |   12 +-
 cpu-defs.h                         |    2 +-
 cpu-exec.c                         |   16 +-
 create_config                      |   57 +++++-
 disas.c                            |    2 +-
 dyngen-exec.h                      |    4 +-
 exec.c                             |    2 +-
 fpu/softfloat-native.c             |   15 +-
 fpu/softfloat-native.h             |   11 +-
 fpu/softfloat.h                    |    6 +-
 gdbstub.c                          |    2 +-
 hw/blizzard_template.h             |    2 +-
 hw/bt-hci.c                        |    2 +-
 hw/gus.c                           |    2 +-
 hw/omap_lcd_template.h             |    2 +-
 hw/petalogix_s3adsp1800_mmu.c      |    8 +-
 hw/pl110_template.h                |    6 +-
 hw/ppc440_bamboo.c                 |    2 +-
 hw/ppce500_mpc8544ds.c             |    4 +-
 hw/pxa2xx_template.h               |    2 +-
 hw/vga.c                           |   14 +-
 hw/vga_template.h                  |    6 +-
 kqemu.c                            |    2 +-
 kvm-all.c                          |   18 +-
 linux-user/arm/nwfpe/double_cpdo.c |    4 +-
 linux-user/arm/nwfpe/fpa11_cpdt.c  |    4 +-
 linux-user/main.c                  |    6 +-
 linux-user/mmap.c                  |    2 +-
 linux-user/qemu.h                  |    8 +-
 linux-user/syscall.c               |   26 ++--
 loader.c                           |    4 +-
 net.c                              |    6 +-
 osdep.c                            |   12 +-
 posix-aio-compat.c                 |    4 +-
 qemu-char.c                        |    2 +-
 qemu-common.h                      |   13 +-
 qemu-lock.h                        |    2 +-
 savevm.c                           |    4 +-
 sdl.c                              |    4 +-
 slirp/ip.h                         |    6 +-
 slirp/slirp_config.h               |    2 +-
 slirp/tcp.h                        |    2 +-
 target-arm/neon_helper.c           |    2 +-
 target-i386/cpu.h                  |    2 +-
 target-i386/exec.h                 |    2 +-
 target-i386/translate.c            |    4 +-
 target-mips/cpu.h                  |    4 +-
 target-ppc/kvm_ppc.c               |    2 +-
 target-ppc/op_helper.c             |   30 ++--
 target-ppc/translate.c             |    4 +-
 target-ppc/translate_init.c        |    4 +-
 target-sparc/op_helper.c           |    2 +-
 tcg/arm/tcg-target.c               |    2 +-
 tcg/sparc/tcg-target.h             |    2 +-
 tcg/tcg.c                          |    2 +-
 tcg/tcg.h                          |    2 +-
 vl.c                               |    6 +-
 vnc.c                              |    2 +-
 72 files changed, 436 insertions(+), 462 deletions(-)