Patchwork monitor: fix build breakage with --disable-vnc

login
register
mail settings
Submitter TeLeMan
Date July 25, 2011, 8:29 a.m.
Message ID <1311582554-963-1-git-send-email-geleman@gmail.com>
Download mbox | patch
Permalink /patch/106620/
State New
Headers show

Comments

TeLeMan - July 25, 2011, 8:29 a.m.
The breakage was introduced by the commit 13661089810d3e59931f3e80d7cb541b99af7071

Signed-off-by: TeLeMan <geleman@gmail.com>
---
 monitor.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Anthony Liguori - July 29, 2011, 2:36 p.m.
On 07/25/2011 03:29 AM, TeLeMan wrote:
> The breakage was introduced by the commit 13661089810d3e59931f3e80d7cb541b99af7071
>
> Signed-off-by: TeLeMan<geleman@gmail.com>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   monitor.c |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index 92cdd05..52ae5f2 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -1200,10 +1200,12 @@ static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_d
>           }
>   	qerror_report(QERR_ADD_CLIENT_FAILED);
>   	return -1;
> +#ifdef CONFIG_VNC
>       } else if (strcmp(protocol, "vnc") == 0) {
>   	int fd = monitor_get_fd(mon, fdname);
>   	vnc_display_add_client(NULL, fd, skipauth);
>   	return 0;
> +#endif
>       } else if ((s = qemu_chr_find(protocol)) != NULL) {
>   	int fd = monitor_get_fd(mon, fdname);
>   	if (qemu_chr_add_client(s, fd)<  0) {
Fabien Chouteau - Aug. 2, 2011, 3:52 p.m.
On 29/07/2011 16:36, Anthony Liguori wrote:
> On 07/25/2011 03:29 AM, TeLeMan wrote:
>> The breakage was introduced by the commit 13661089810d3e59931f3e80d7cb541b99af7071
>>
>> Signed-off-by: TeLeMan<geleman@gmail.com>
> 
> Applied.  Thanks.
> 

I think this patch should be applied in stable-0.15.

Regards,

Patch

diff --git a/monitor.c b/monitor.c
index 92cdd05..52ae5f2 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1200,10 +1200,12 @@  static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_d
         }
 	qerror_report(QERR_ADD_CLIENT_FAILED);
 	return -1;
+#ifdef CONFIG_VNC
     } else if (strcmp(protocol, "vnc") == 0) {
 	int fd = monitor_get_fd(mon, fdname);
 	vnc_display_add_client(NULL, fd, skipauth);
 	return 0;
+#endif
     } else if ((s = qemu_chr_find(protocol)) != NULL) {
 	int fd = monitor_get_fd(mon, fdname);
 	if (qemu_chr_add_client(s, fd) < 0) {