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(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
