Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-02-18' into staging

[mirror_qemu.git] / include / ui / console.h

diff --git a/include/ui/console.h b/include/ui/console.h
index de88bba478c98ee46932a36252c48548f9d99a52..0f97d86728045dd41b96df47d87601419113684e 100644 (file)
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -335,6 +335,7 @@ void vnc_display_init(const char *id);
 void vnc_display_open(const char *id, Error **errp);
 void vnc_display_add_client(const char *id, int csock, bool skipauth);
 char *vnc_display_local_addr(const char *id);
+void vnc_auto_assign_id(QemuOptsList *olist, QemuOpts *opts);
 #ifdef CONFIG_VNC
 int vnc_display_password(const char *id, const char *password);
 int vnc_display_pw_expire(const char *id, time_t expires);