From: Anthony Liguori Date: Mon, 10 Sep 2012 17:48:43 +0000 (-0500) Subject: Merge remote-tracking branch 'mst/tags/for_anthony' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=14df77a609e39403c3ec814bae63bec0fb4d24d2;p=qemu.git 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 --- 14df77a609e39403c3ec814bae63bec0fb4d24d2