Skip to content
  • Peter Maydell's avatar
    Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · 81ab11a7
    Peter Maydell authored
    
    
    Usual mix of patches, the most important being Alex and Marcelo's
    kvmclock fix.  This was reverted last minute for 2.1, but it is now back
    with the problematic case fixed.
    
    Note: I will soon switch to a subkey for signing purposes.  To verify
    future signed pull requests from me, please update my key with
    "gpg --recv-keys 9B4D86F2".  You should see 3 new subkeys---the
    one for signing will be a 2048-bit RSA key, 4E6B09D7.
    
    # gpg: Signature made Fri 26 Sep 2014 15:34:44 BST using RSA key ID 9B4D86F2
    # gpg: Good signature from "Paolo Bonzini <pbonzini@redhat.com>"
    # gpg:                 aka "Paolo Bonzini <bonzini@gnu.org>"
    
    * remotes/bonzini/tags/for-upstream:
      kvm/valgrind: don't mark memory as initialized
      po: fix conflict with %.mo rule in rules.mak
      kvmvapic: fix migration when VM paused and when not running Windows
      serial: check if backed by a physical serial port at realize time
      serial: reset state at startup
      target-i386: update fp status fix
      hw/dma/i8257: Silence phony error message
      kvmclock: Ensure time in migration never goes backward
      kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation
      Introduce cpu_clean_all_dirty
      pit: fix pit interrupt can't inject into vm after migration
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    81ab11a7