]> Git Repo - qemu.git/commitdiff
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
authorPeter Maydell <[email protected]>
Thu, 13 Feb 2020 13:40:59 +0000 (13:40 +0000)
committerPeter Maydell <[email protected]>
Thu, 13 Feb 2020 13:40:59 +0000 (13:40 +0000)
* various small fixes and cleanups
* fixes for the ucode revision patch from the previous pull request

# gpg: Signature made Wed 12 Feb 2020 15:30:24 GMT
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <[email protected]>" [full]
# gpg:                 aka "Paolo Bonzini <[email protected]>" [full]
# 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:
  target/i386: enable monitor and ucode revision with -cpu max
  target/i386: check for availability of MSR_IA32_UCODE_REV as an emulated MSR
  target/i386: fix TCG UCODE_REV access
  build: move TARGET_GPROF to config-host.mak
  exec: do not define use_icount for user-mode emulation
  minikconf: accept alnum identifiers
  Remove support for CLOCK_MONOTONIC not being defined
  seqlock: fix seqlock_write_unlock_impl function
  vl: Don't mismatch g_strsplit()/g_free()

Signed-off-by: Peter Maydell <[email protected]>
1  2 
scripts/minikconf.py
vl.c

index 2f9647d0faa511e5cebd9bdf74c428a989589908,febd9a479f5f24463004063265f9e8e048e72624..90b99517c1162db0524b8f2d798424fc6c08bae4
mode 100755,100644..100755
diff --cc vl.c
Simple merge
This page took 0.040069 seconds and 4 git commands to generate.