* [Qemu-devel] [PATCH] monitor: fix build breakage with --disable-vnc
@ 2011-07-25 8:29 TeLeMan
2011-07-29 14:36 ` Anthony Liguori
0 siblings, 1 reply; 3+ messages in thread
From: TeLeMan @ 2011-07-25 8:29 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-trivial, TeLeMan, qemu-devel
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(-)
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) {
--
1.7.3.1.msysgit.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] monitor: fix build breakage with --disable-vnc
2011-07-25 8:29 [Qemu-devel] [PATCH] monitor: fix build breakage with --disable-vnc TeLeMan
@ 2011-07-29 14:36 ` Anthony Liguori
2011-08-02 15:52 ` Fabien Chouteau
0 siblings, 1 reply; 3+ messages in thread
From: Anthony Liguori @ 2011-07-29 14:36 UTC (permalink / raw)
To: TeLeMan; +Cc: qemu-trivial, qemu-devel
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) {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] monitor: fix build breakage with --disable-vnc
2011-07-29 14:36 ` Anthony Liguori
@ 2011-08-02 15:52 ` Fabien Chouteau
0 siblings, 0 replies; 3+ messages in thread
From: Fabien Chouteau @ 2011-08-02 15:52 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-trivial, TeLeMan, qemu-devel
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,
--
Fabien Chouteau
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-02 15:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-25 8:29 [Qemu-devel] [PATCH] monitor: fix build breakage with --disable-vnc TeLeMan
2011-07-29 14:36 ` Anthony Liguori
2011-08-02 15:52 ` Fabien Chouteau
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.