]> git.proxmox.com Git - mirror_qemu.git/commit
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)
commit14df77a609e39403c3ec814bae63bec0fb4d24d2
treefaabedbfdaa0d8b467368f2be07d7d4eb929c247
parent455aa1e0818653c41fd794435b982426ce21ba2f
parent1241ed94c331ddd8fc8297b02b4508ead59467de
Merge remote-tracking branch 'mst/tags/for_anthony' into staging

* 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
monitor.c
monitor.h