From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlJYg-000085-3S for qemu-devel@nongnu.org; Wed, 19 Dec 2012 08:19:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlJMk-0005iH-MM for qemu-devel@nongnu.org; Wed, 19 Dec 2012 08:07:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59047) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlJMk-0005hq-CT for qemu-devel@nongnu.org; Wed, 19 Dec 2012 08:07:18 -0500 From: Stefan Hajnoczi Date: Wed, 19 Dec 2012 14:07:16 +0100 Message-Id: <1355922436-8378-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH] spice: drop incorrect vm_change_state_handler() opaque List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Uri Lublin , Gerd Hoffmann The spice_server pointer is a global variable and vm_change_state_handler() therefore does not use its opaque parameter. The vm change state handler is added with a pointer to the spice_server pointer. This is useless and we probably would not want 2 levels of pointers. Signed-off-by: Stefan Hajnoczi --- ui/spice-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ui/spice-core.c b/ui/spice-core.c index ac46deb..c128c0b 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -709,7 +709,7 @@ void qemu_spice_init(void) qemu_spice_input_init(); qemu_spice_audio_init(); - qemu_add_vm_change_state_handler(vm_change_state_handler, &spice_server); + qemu_add_vm_change_state_handler(vm_change_state_handler, NULL); g_free(x509_key_file); g_free(x509_cert_file); @@ -736,8 +736,7 @@ int qemu_spice_add_interface(SpiceBaseInstance *sin) */ spice_server = spice_server_new(); spice_server_init(spice_server, &core_interface); - qemu_add_vm_change_state_handler(vm_change_state_handler, - &spice_server); + qemu_add_vm_change_state_handler(vm_change_state_handler, NULL); } return spice_server_add_interface(spice_server, sin); -- 1.8.0.2