diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-04 13:25:20 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-04 13:25:20 -0600 |
| commit | a4c7ecd8ca998044bfafa0bdd7ea47270e7ebad6 (patch) | |
| tree | 1ede9905efbe4429fd8a49efc6d255fc425296ef /ui | |
| parent | 346c1f8b52afca515fecf95d5c215751b73fe9e1 (diff) | |
| parent | bfb82a28752d29291adf932c3a9941e8383203af (diff) | |
| download | qemu-a4c7ecd8ca998044bfafa0bdd7ea47270e7ebad6.zip qemu-a4c7ecd8ca998044bfafa0bdd7ea47270e7ebad6.tar.gz qemu-a4c7ecd8ca998044bfafa0bdd7ea47270e7ebad6.tar.bz2 | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
spice: drop incorrect vm_change_state_handler() opaque
linux-user/syscall.c: remove forward declarations
hw/mcf5206: Reduce size of lookup table
Remove --sparc_cpu option from the configure list
pseries: Remove unneeded include statement (fixes MinGW builds)
pc_sysfw: Check for qemu_find_file() failure
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/spice-core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index 3e44779..d83de2a 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); |