From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 5 Jun 2014 18:16:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kvm/uq/master' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9f0355b590ac523d0c4e67c416c3f9cf7af3d574;p=qemu.git

Merge remote-tracking branch 'remotes/kvm/uq/master' into staging

* remotes/kvm/uq/master:
  kvm: Fix eax for cpuid leaf 0x40000000
  kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation
  kvm: Enable -cpu option to hide KVM
  kvm: Ensure negative return value on kvm_init() error handling path
  target-i386: set CC_OP to CC_OP_EFLAGS in cpu_load_eflags
  target-i386: get CPL from SS.DPL
  target-i386: rework CPL checks during task switch, preparing for next patch
  target-i386: fix segment flags for SMM and VM86 mode
  target-i386: Fix vm86 mode regression introduced in fd460606fd6f.
  kvm_stat: allow choosing between tracepoints and old stats
  kvmclock: Ensure time in migration never goes backward

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

9f0355b590ac523d0c4e67c416c3f9cf7af3d574