tree 8175716bcd820616bc2fa278d98536de50aa2595
parent 1acd5a373905ddb28957842256a038956941f332
parent 00f4d64ee76e873be881a82d893a591487aa7950
author Anthony Liguori <aliguori@us.ibm.com> 1372858619 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1372858620 -0500

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

# By Michael S. Tsirkin (2) and others
# Via Paolo Bonzini
* qemu-kvm/uq/master:
  kvmclock: clock should count only if vm is running
  pci-assign: remove the duplicate function name in debug message
  kvm: skip system call when msi route is unchanged
  kvm: zero-initialize KVM_SET_GSI_ROUTING input
  kvm: add detail error message when fail to add ioeventfd

Message-id: 1372841072-22265-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>