aboutsummaryrefslogtreecommitdiff
path: root/monitor.h
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-09-10 12:48:43 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-09-10 12:48:43 -0500
commit14df77a609e39403c3ec814bae63bec0fb4d24d2 (patch)
treefaabedbfdaa0d8b467368f2be07d7d4eb929c247 /monitor.h
parent455aa1e0818653c41fd794435b982426ce21ba2f (diff)
parent1241ed94c331ddd8fc8297b02b4508ead59467de (diff)
downloadqemu-14df77a609e39403c3ec814bae63bec0fb4d24d2.zip
qemu-14df77a609e39403c3ec814bae63bec0fb4d24d2.tar.gz
qemu-14df77a609e39403c3ec814bae63bec0fb4d24d2.tar.bz2
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
Diffstat (limited to 'monitor.h')
-rw-r--r--monitor.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/monitor.h b/monitor.h
index 5fc2983..64c1561 100644
--- a/monitor.h
+++ b/monitor.h
@@ -67,6 +67,7 @@ int monitor_read_block_device_key(Monitor *mon, const char *device,
void *opaque);
int monitor_get_fd(Monitor *mon, const char *fdname);
+int monitor_handle_fd_param(Monitor *mon, const char *fdname);
void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
GCC_FMT_ATTR(2, 0);