]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@amazon.com>
Fri, 24 Jan 2014 23:52:44 +0000 (15:52 -0800)
committerAnthony Liguori <aliguori@amazon.com>
Fri, 24 Jan 2014 23:52:44 +0000 (15:52 -0800)
commit0169c511554cb0014a00290b0d3d26c31a49818f
tree14a38b1ffe2fde4125b57198698c5ba791feea58
parent1c51e68b182bb335464bb19ad2517fd43c58c127
parent439d19f2922ac409ee224bc1e5522cee7009d829
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

* qemu-kvm/uq/master:
  kvm: always update the MPX model specific register
  KVM: fix addr type for KVM_IOEVENTFD
  KVM: Retry KVM_CREATE_VM on EINTR
  mempath prefault: fix off-by-one error
  kvm: x86: Separately write feature control MSR on reset
  roms: Flush icache when writing roms to guest memory
  target-i386: clear guest TSC on reset
  target-i386: do not special case TSC writeback
  target-i386: Intel MPX

Conflicts:
exec.c

aliguori: fix trivial merge conflict in exec.c

Signed-off-by: Anthony Liguori <aliguori@amazon.com>
exec.c
kvm-all.c
target-i386/cpu.c
target-i386/cpu.h
target-i386/kvm.c