Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
commit34daffa04886444dafd4a6951167225e824003d0
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 2 Jan 2013 14:01:54 +0000 (2 08:01 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 2 Jan 2013 14:01:54 +0000 (2 08:01 -0600)
tree82d512568e98edd86c7433be61f567bdf6a693f8
parent079944e695589364d19de31f27761c6bdea1c207
parent0a2a59d35cbabf63c91340a1c62038e3e60538c1
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

* qemu-kvm/uq/master:
  qemu-kvm/pci-assign: 64 bits bar emulation
  target-i386: Enabling IA32_TSC_ADJUST for QEMU KVM guest VMs

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
hw/kvm/pci-assign.c
target-i386/cpu.h
target-i386/kvm.c
target-i386/machine.c