* [Qemu-devel] [PATCH] monitor: fix build breakage for !CONFIG_VNC
@ 2011-08-10 14:18 Jamie Iles
2011-08-11 20:37 ` Luiz Capitulino
0 siblings, 1 reply; 3+ messages in thread
From: Jamie Iles @ 2011-08-10 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: Jamie Iles, Markus Armbruster, Luiz Capitulino
Commit c62f6d1 (monitor: fix build breakage with --disable-vnc)
conditionalised some VNC setup code but left an unused variable. Move
the variable into the conditional code to fix the build breakage.
Cc: Luiz Capitulino <lcapitulino@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
monitor.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/monitor.c b/monitor.c
index 1b8ba2c..fee572c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1189,7 +1189,6 @@ static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_d
{
const char *protocol = qdict_get_str(qdict, "protocol");
const char *fdname = qdict_get_str(qdict, "fdname");
- int skipauth = qdict_get_try_bool(qdict, "skipauth", 0);
CharDriverState *s;
if (strcmp(protocol, "spice") == 0) {
@@ -1203,6 +1202,7 @@ static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_d
#ifdef CONFIG_VNC
} else if (strcmp(protocol, "vnc") == 0) {
int fd = monitor_get_fd(mon, fdname);
+ int skipauth = qdict_get_try_bool(qdict, "skipauth", 0);
vnc_display_add_client(NULL, fd, skipauth);
return 0;
#endif
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] monitor: fix build breakage for !CONFIG_VNC
2011-08-10 14:18 [Qemu-devel] [PATCH] monitor: fix build breakage for !CONFIG_VNC Jamie Iles
@ 2011-08-11 20:37 ` Luiz Capitulino
0 siblings, 0 replies; 3+ messages in thread
From: Luiz Capitulino @ 2011-08-11 20:37 UTC (permalink / raw)
To: Jamie Iles; +Cc: qemu-devel, Markus Armbruster
On Wed, 10 Aug 2011 15:18:42 +0100
Jamie Iles <jamie@jamieiles.com> wrote:
> Commit c62f6d1 (monitor: fix build breakage with --disable-vnc)
> conditionalised some VNC setup code but left an unused variable. Move
> the variable into the conditional code to fix the build breakage.
>
> Cc: Luiz Capitulino <lcapitulino@redhat.com>
> Cc: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Applied to the monitor branch, thanks.
> ---
> monitor.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index 1b8ba2c..fee572c 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -1189,7 +1189,6 @@ static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_d
> {
> const char *protocol = qdict_get_str(qdict, "protocol");
> const char *fdname = qdict_get_str(qdict, "fdname");
> - int skipauth = qdict_get_try_bool(qdict, "skipauth", 0);
> CharDriverState *s;
>
> if (strcmp(protocol, "spice") == 0) {
> @@ -1203,6 +1202,7 @@ static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_d
> #ifdef CONFIG_VNC
> } else if (strcmp(protocol, "vnc") == 0) {
> int fd = monitor_get_fd(mon, fdname);
> + int skipauth = qdict_get_try_bool(qdict, "skipauth", 0);
> vnc_display_add_client(NULL, fd, skipauth);
> return 0;
> #endif
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Qemu-devel] [PATCH] monitor: fix build breakage for !CONFIG_VNC
2011-08-25 16:41 [Qemu-devel] [PULL 0/1]: Monitor queue Luiz Capitulino
@ 2011-08-25 16:41 ` Luiz Capitulino
0 siblings, 0 replies; 3+ messages in thread
From: Luiz Capitulino @ 2011-08-25 16:41 UTC (permalink / raw)
To: qemu-devel; +Cc: Jamie Iles, aliguori, Markus Armbruster
From: Jamie Iles <jamie@jamieiles.com>
Commit c62f6d1 (monitor: fix build breakage with --disable-vnc)
conditionalised some VNC setup code but left an unused variable. Move
the variable into the conditional code to fix the build breakage.
Cc: Luiz Capitulino <lcapitulino@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/monitor.c b/monitor.c
index ada51d0..04f465a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1189,7 +1189,6 @@ static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_d
{
const char *protocol = qdict_get_str(qdict, "protocol");
const char *fdname = qdict_get_str(qdict, "fdname");
- int skipauth = qdict_get_try_bool(qdict, "skipauth", 0);
CharDriverState *s;
if (strcmp(protocol, "spice") == 0) {
@@ -1203,6 +1202,7 @@ static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_d
#ifdef CONFIG_VNC
} else if (strcmp(protocol, "vnc") == 0) {
int fd = monitor_get_fd(mon, fdname);
+ int skipauth = qdict_get_try_bool(qdict, "skipauth", 0);
vnc_display_add_client(NULL, fd, skipauth);
return 0;
#endif
--
1.7.6.1.385.gb7fcd0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-25 16:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-10 14:18 [Qemu-devel] [PATCH] monitor: fix build breakage for !CONFIG_VNC Jamie Iles
2011-08-11 20:37 ` Luiz Capitulino
-- strict thread matches above, loose matches on Subject: below --
2011-08-25 16:41 [Qemu-devel] [PULL 0/1]: Monitor queue Luiz Capitulino
2011-08-25 16:41 ` [Qemu-devel] [PATCH] monitor: fix build breakage for !CONFIG_VNC Luiz Capitulino
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).