Commit a470b332 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* core support for MemoryRegionCache from myself
* rules.mak speedup and cleanups from myself and Marc-Adnré
* multiboot command line fix from Vlad
* SCSI fixes from myself
* small qemu-timer speedup from myself
* x86 debugging improvements from Doug
* configurable Q35 devices from  Chao
* x86 5-level paging support from Kirill
* x86 SHA_NI support for KVM from Yi Sun
* improved kvmclock migration logic from Marcelo
* bugfixes and doc fixes from others

# gpg: Signature made Thu 22 Dec 2016 15:01:13 GMT
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (25 commits)
  x86: implement la57 paging mode
  target-i386: Fix eflags.TF/#DB handling of syscall/sysret insns
  kvmclock: reduce kvmclock difference on migration
  kvm: sync linux headers
  scsi-disk: fix VERIFY for scsi-block
  hw/block/pflash_cfi*.c: fix confusing assert fail message
  multiboot: copy the cmdline verbatim, unescape module strings
  x86: Fix x86_64 'g' packet response to gdb from 32-bit mode.
  pc: make pit configurable
  pc: make sata configurable
  pc: make smbus configurable
  target-i386: Add Intel SHA_NI instruction support.
  block: drop remaining legacy aio functions in comment
  main-loop: update comment for qemu_mutex_lock/unlock_iothread
  timer: fix misleading comment in timer.h
  qemu-timer: check active_timers outside lock/event
  virtio-scsi: introduce virtio_scsi_acquire/release
  build-sys: remove libtool left-over
  rules.mak: add more rules to avoid chaining
  rules.mak: speedup save-vars load-vars
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c76904ef 6c7c3c21

.gitignore

+0 −4
Original line number Diff line number Diff line
@@ -82,10 +82,6 @@ 
*.d

!/scripts/qemu-guest-agent/fsfreeze-hook.d

*.o

*.lo

*.la

*.pc

.libs

.sdk

*.gcda

*.gcno

Makefile

+3 −6
Original line number Diff line number Diff line
@@ -231,12 +231,10 @@ ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) 


recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)



$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h | $(BUILD_DIR)/version.lo

$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h

	$(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.o")

$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc config-host.h

	$(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.lo")



Makefile: $(version-obj-y) $(version-lobj-y)

Makefile: $(version-obj-y)



######################################################################

# Build libraries
@@ -358,10 +356,9 @@ clean: 
	rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h

	rm -f qemu-options.def

	rm -f *.msi

	find . \( -name '*.l[oa]' -o -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f -exec rm {} +

	find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f -exec rm {} +

	rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~

	rm -f fsdev/*.pod

	rm -rf .libs */.libs

	rm -f qemu-img-cmds.h

	rm -f ui/shader/*-vert.h ui/shader/*-frag.h

	@# May not be present in GENERATED_HEADERS

Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ common-obj-y += disas/ 
######################################################################

# Resource file for Windows executables

version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o

version-lobj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.lo



######################################################################

# tracing

Makefile.target

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ $(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all 
else

stap:

endif

.PHONY: stap



all: $(PROGS) stap

configure

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ TMPB="qemu-conf" 
TMPC="${TMPDIR1}/${TMPB}.c"

TMPO="${TMPDIR1}/${TMPB}.o"

TMPCXX="${TMPDIR1}/${TMPB}.cxx"

TMPL="${TMPDIR1}/${TMPB}.lo"

TMPA="${TMPDIR1}/lib${TMPB}.la"

TMPE="${TMPDIR1}/${TMPB}.exe"

TMPMO="${TMPDIR1}/${TMPB}.mo"