mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
spice: notify on vm state change only via spice_server_vm_start/stop
QXLWorker->start/stop are deprecated since spice-server 0.11.2 Signed-off-by: Yonit Halperin <yhalperi@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
f5bb039c6d
commit
71d388d420
4 changed files with 45 additions and 7 deletions
|
@ -126,18 +126,44 @@ void qemu_spice_wakeup(SimpleSpiceDisplay *ssd)
|
|||
ssd->worker->wakeup(ssd->worker);
|
||||
}
|
||||
|
||||
void qemu_spice_start(SimpleSpiceDisplay *ssd)
|
||||
#if SPICE_SERVER_VERSION < 0x000b02 /* before 0.11.2 */
|
||||
static void qemu_spice_start(SimpleSpiceDisplay *ssd)
|
||||
{
|
||||
trace_qemu_spice_start(ssd->qxl.id);
|
||||
ssd->worker->start(ssd->worker);
|
||||
}
|
||||
|
||||
void qemu_spice_stop(SimpleSpiceDisplay *ssd)
|
||||
static void qemu_spice_stop(SimpleSpiceDisplay *ssd)
|
||||
{
|
||||
trace_qemu_spice_stop(ssd->qxl.id);
|
||||
ssd->worker->stop(ssd->worker);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
static int spice_display_is_running;
|
||||
|
||||
void qemu_spice_display_start(void)
|
||||
{
|
||||
spice_display_is_running = true;
|
||||
}
|
||||
|
||||
void qemu_spice_display_stop(void)
|
||||
{
|
||||
spice_display_is_running = false;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd)
|
||||
{
|
||||
#if SPICE_SERVER_VERSION < 0x000b02 /* before 0.11.2 */
|
||||
return ssd->running;
|
||||
#else
|
||||
return spice_display_is_running;
|
||||
#endif
|
||||
}
|
||||
|
||||
static SimpleSpiceUpdate *qemu_spice_create_update(SimpleSpiceDisplay *ssd)
|
||||
{
|
||||
SimpleSpiceUpdate *update;
|
||||
|
@ -272,6 +298,7 @@ void qemu_spice_destroy_host_primary(SimpleSpiceDisplay *ssd)
|
|||
void qemu_spice_vm_change_state_handler(void *opaque, int running,
|
||||
RunState state)
|
||||
{
|
||||
#if SPICE_SERVER_VERSION < 0x000b02 /* before 0.11.2 */
|
||||
SimpleSpiceDisplay *ssd = opaque;
|
||||
|
||||
if (running) {
|
||||
|
@ -281,6 +308,7 @@ void qemu_spice_vm_change_state_handler(void *opaque, int running,
|
|||
qemu_spice_stop(ssd);
|
||||
ssd->running = false;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void qemu_spice_display_init_common(SimpleSpiceDisplay *ssd, DisplayState *ds)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue