diff options
| author | Anthony Liguori | 2012-09-10 19:48:43 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2012-09-10 19:48:43 +0200 |
| commit | 14df77a609e39403c3ec814bae63bec0fb4d24d2 (patch) | |
| tree | faabedbfdaa0d8b467368f2be07d7d4eb929c247 /hw/vhost.h | |
| parent | socket: don't attempt to reconnect a TCP socket in server mode (diff) | |
| parent | vhost: Pass device path to vhost_dev_init() (diff) | |
| download | qemu-14df77a609e39403c3ec814bae63bec0fb4d24d2.tar.gz qemu-14df77a609e39403c3ec814bae63bec0fb4d24d2.tar.xz qemu-14df77a609e39403c3ec814bae63bec0fb4d24d2.zip | |
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 'hw/vhost.h')
| -rw-r--r-- | hw/vhost.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/vhost.h b/hw/vhost.h index 80e64df860..0c47229f91 100644 --- a/hw/vhost.h +++ b/hw/vhost.h @@ -44,7 +44,8 @@ struct vhost_dev { bool force; }; -int vhost_dev_init(struct vhost_dev *hdev, int devfd, bool force); +int vhost_dev_init(struct vhost_dev *hdev, int devfd, const char *devpath, + bool force); void vhost_dev_cleanup(struct vhost_dev *hdev); bool vhost_dev_query(struct vhost_dev *hdev, VirtIODevice *vdev); int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev); |