diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-11-16 14:11:05 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-11-16 14:11:05 -0600 |
| commit | 43ae691e775707b854f9920797c81b6b298bde61 (patch) | |
| tree | 68a4348ffd0942a148b6865d009ae359f6bd4b66 /ui/spice-core.c | |
| parent | 2834c3e0140c3b0ed4422909dfa0607b7213d95d (diff) | |
| parent | 7466bc49107fbd84336ba680f860d5eadd6def13 (diff) | |
| download | focaccia-qemu-43ae691e775707b854f9920797c81b6b298bde61.tar.gz focaccia-qemu-43ae691e775707b854f9920797c81b6b298bde61.zip | |
Merge remote branch 'spice/bugfix.2' into staging
Diffstat (limited to 'ui/spice-core.c')
| -rw-r--r-- | ui/spice-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index 6c404b39fb..d13bdc269d 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -95,7 +95,7 @@ static void watch_update_mask(SpiceWatch *watch, int event_mask) on_read = watch_read; } if (watch->event_mask & SPICE_WATCH_EVENT_WRITE) { - on_read = watch_write; + on_write = watch_write; } qemu_set_fd_handler(watch->fd, on_read, on_write, watch); } @@ -240,7 +240,7 @@ void qemu_spice_init(void) char *x509_key_file = NULL, *x509_cert_file = NULL, *x509_cacert_file = NULL; - int port, tls_port, len, addr_flags, streaming_video; + int port, tls_port, len, addr_flags; spice_image_compression_t compression; spice_wan_compression_t wan_compr; @@ -344,7 +344,7 @@ void qemu_spice_init(void) str = qemu_opt_get(opts, "streaming-video"); if (str) { - streaming_video = parse_stream_video(str); + int streaming_video = parse_stream_video(str); spice_server_set_streaming_video(spice_server, streaming_video); } |