]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 10 Sep 2012 17:48:43 +0000 (12:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 10 Sep 2012 17:48:43 +0000 (12:48 -0500)
* mst/tags/for_anthony:
  vhost: Pass device path to vhost_dev_init()
  monitor: Rename+move net_handle_fd_param -> monitor_handle_fd_param
  pcie_aer: clear cmask for Advanced Error Interrupt Message Number
  pcie: drop version_id field for live migration
  qemu: add .exrc

1  2 
monitor.c
monitor.h

diff --cc monitor.c
Simple merge
diff --cc monitor.h
Simple merge