Message ID | 1316190619-4611-4-git-send-email-lcapitulino@redhat.com |
---|---|
State | New |
Headers | show |
On Fri, 2011-09-16 at 13:30 -0300, Luiz Capitulino wrote: > From: TeLeMan <geleman@gmail.com> > > The breakage was introduced by the commit 13661089810d3e59931f3e80d7cb541b99af7071 This patch, as well as the next "monitor: fix build breakage for ! CONFIG_VNC" are already in stable, and have been for a few weeks. Justin
On Fri, 16 Sep 2011 12:40:40 -0500 "Justin M. Forbes" <jforbes@redhat.com> wrote: > On Fri, 2011-09-16 at 13:30 -0300, Luiz Capitulino wrote: > > From: TeLeMan <geleman@gmail.com> > > > > The breakage was introduced by the commit 13661089810d3e59931f3e80d7cb541b99af7071 > > This patch, as well as the next "monitor: fix build breakage for ! > CONFIG_VNC" are already in stable, and have been for a few weeks. Ah, ok. Someone has submitted them to the list and I thought they weren't applied...
diff --git a/monitor.c b/monitor.c index 718935b..1b8ba2c 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) {