Skip to content

configure and Makefile cleanup

Juan Quintela kvm 1 version Applied

Status from this message: Applied, but can you look at upstreaming this? Thanks.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest24 patches 28 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/24Don't disable werror unconditionallyconfigure+0 -24 replies
2/24extboot.bin is a generated file.gitignore+1 -00 replies
3/24Remove merge artifactsMakefile.target+0 -80 replies
4/24piix4_dev is not used for pc'sMakefile.target hw/piix_pci.c+1 -45 replies
5/24compatfd is included before, and it is compiled unconditionallyMakefile+0 -412 replies
6/24Use common style for signalfdcompatfd.c configure+3 -30 replies
7/24One CONFIG_EVENTFD should be enoughcompatfd.c configure qemu-kvm.c+2 -60 replies
8/24Bring ia64 to current arch selection codeconfigure+0 -30 replies
9/24Use configure way of enabling kvmconfigure+1 -60 replies
10/24Prin kvm options values as everything elseconfigure+9 -230 replies
11/24KVM temp hack not needed anymoreconfigure+0 -50 replies
12/24Introduce libs_softmmu to device assignment codeMakefile.target configure+1 -30 replies
13/24Use compile_prog function in thee missing compilationsconfigure+3 -30 replies
14/24Test for libpci, not only for headerconfigure+2 -20 replies
15/24Rename USE_KVM_* to CONFIG_KVM_*Makefile.target configure create_config +7 more+25 -350 replies
16/24Move kvm specific tests after main kvm testconfigure+69 -710 replies
17/24Add kvm-cap-pit command line flagsconfigure+17 -20 replies
18/24Add kvm-cap-device-assignment command line flagsconfigure+18 -20 replies
19/24Fix compilation without device assignmentqemu-kvm-x86.c+2 -00 replies
20/24Only print kvm options when kvm is enabledconfigure+5 -32 replies
21/24__user is not used anywhere in qemu sourcesconfigure+0 -20 replies
22/24fix mis-merge (we define pkgversion 3 lines aboveconfigure+0 -10 replies
23/24Get CONFIG_CPU_EMULATION back to lifeMakefile.target configure exec.c +2 more+11 -94 replies
24/24Remove build-targets-* rules that are always emptyMakefile+0 -70 replies

Reviews trailers per patch

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

Read the v1 thread

Cover letter [PATCH 00/24] configure and Makefile cleanup

This series:
- werror is not disabled unconditoanally, you can disable it with --disable-werror.
- clean configure and Makefile* of mis-merges
- sync such files to qemu upstream
- kvm options are detected and configured _after_ detecting kvm, not the other way around
- add command line options and change styse so kvm-cap-pit and kvm-cap-device-assignment looks like the other options. Bring command line flags to enable/disable them, and fix code to compile.
- CONFIG_CPU_EMULATION is back, and it works (it is still a hack, proper fix means moving code to new files and other conditional compilation, better to do it at qemu upstream.
- Why do we define "-D__user=" for gcc? Nothing uses it (/me guess sparse missmerge)

What I didn't touch:
- kvm-kmod.
- CFLAGS += $(KVM_CFLAGS)
on Makefile.target, only 4-5 files need them. Didn't investigate too much into it.
- I only tested it on x86_64, i386 should work. powerpc/ia64 -> dunno.

For upstream:
- kvm_cflags reorganization: make sense
- KVM_CAP_PIT: haven't looked how much support is missing there
- DEVICE_ASSIGNMENT: idem
- CONFIG_CPU_EMULATION: Proper implementation is not trivial. What is in qemu-kvm is a hack, proper integration requires moving code back and forth. Not sure how important is to have this option.

Comments?

Juan Quintela (24):
Don't disable werror unconditionally
extboot.bin is a generated file
Remove merge artifacts
piix4_dev is not used for pc's
compatfd is included before, and it is compiled unconditionally Use common style for signalfd
One CONFIG_EVENTFD should be enough
Bring ia64 to current arch selection code
Use configure way of enabling kvm
Prin kvm options values as everything else
KVM temp hack not needed anymore
Introduce libs_softmmu to device assignment code
Use compile_prog function in thee missing compilations Test for libpci, not only for header
Rename USE_KVM_* to CONFIG_KVM_*
Move kvm specific tests after main kvm test
Add kvm-cap-pit command line flags
Add kvm-cap-device-assignment command line flags
Fix compilation without device assignment
Only print kvm options when kvm is enabled
__user is not used anywhere in qemu sources
fix mis-merge (we define pkgversion 3 lines above
Get CONFIG_CPU_EMULATION back to life
Remove build-targets-* rules that are always empty

 .gitignore              |    1 +
 Makefile                |   11 --
 Makefile.target         |   31 ++-----
 compatfd.c              |    4 +-
 configure               |  237 +++++++++++++++++++++++------------------------
 create_config           |    3 -
 exec.c                  |    2 +
 hw/ipf.c                |    4 +-
 hw/pc.c                 |    6 +-
 hw/pci-hotplug.c        |   14 ++--
 hw/pci.c                |    4 +-
 hw/pcspk.c              |    2 +-
 hw/piix_pci.c           |    3 -
 qemu-kvm-x86.c          |    2 +
 qemu-kvm.c              |   10 +-
 qemu-kvm.h              |    2 +-
 target-i386/fake-exec.c |    4 -
 vl.c                    |    2 +-
 18 files changed, 154 insertions(+), 188 deletions(-)