target/i386: WHPX: set CPUID_EXT_HYPERVISOR bit

[qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index c8116694a072404f0a3378c2266b7d8644e09655..727ef118f3d9dc737a8d9090e3520c043406f3a2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -438,21 +438,23 @@ all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
 qemu-version.h: FORCE
        $(call quiet-command, \
                (cd $(SRC_PATH); \
-               printf '#define QEMU_PKGVERSION '; \
                if test -n "$(PKGVERSION)"; then \
-                       printf '"$(PKGVERSION)"\n'; \
+                       pkgvers="$(PKGVERSION)"; \
                else \
                        if test -d .git; then \
-                               printf '" ('; \
-                               git describe --match 'v*' 2>/dev/null | tr -d '\n'; \
+                               pkgvers=$$(git describe --match 'v*' 2>/dev/null | tr -d '\n');\
                                if ! git diff-index --quiet HEAD &>/dev/null; then \
-                                       printf -- '-dirty'; \
+                                       pkgvers="$${pkgvers}-dirty"; \
                                fi; \
-                               printf ')"\n'; \
-                       else \
-                               printf '""\n'; \
                        fi; \
-               fi) > [email protected])
+               fi; \
+               printf "#define QEMU_PKGVERSION \"$${pkgvers}\"\n"; \
+               if test -n "$${pkgvers}"; then \
+                       printf '#define QEMU_FULL_VERSION QEMU_VERSION " (" QEMU_PKGVERSION ")"\n'; \
+               else \
+                       printf '#define QEMU_FULL_VERSION QEMU_VERSION\n'; \
+               fi; \
+               ) > [email protected])
        $(call quiet-command, if ! cmp -s $@ [email protected]; then \
          mv [email protected] $@; \
         else \
@@ -775,7 +777,6 @@ bepo    cz
 ifdef INSTALL_BLOBS
 BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
 vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \
-acpi-dsdt.aml \
 ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \
 pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \
 pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \
@@ -1046,10 +1047,16 @@ endif
 include $(SRC_PATH)/tests/docker/Makefile.include
 include $(SRC_PATH)/tests/vm/Makefile.include
 
+printgen:
+       @echo $(GENERATED_FILES)
+
 .PHONY: help
 help:
        @echo  'Generic targets:'
        @echo  '  all             - Build all'
+ifdef CONFIG_MODULES
+       @echo  '  modules         - Build all modules'
+endif
        @echo  '  dir/file.o      - Build specified target only'
        @echo  '  install         - Install QEMU, documentation and tools'
        @echo  '  ctags/TAGS      - Generate tags file for editors'