mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spice: delay starting until display are initialized

Browse Source 
QEMU used to run qemu_spice.display_init() before vm_start(), and
QXL/display interfaces where started then. Now, vm_start() happens
before QXL/display interfaces are added and Spice server doesn't
automatically start them in this case (fixed in spice git)

Fixes Spice regression introduced after 5.2, with refactoring commits
b4e1a34211 ("vl: remove separate preconfig main_loop") and
facf7c60ee ("vl: initialize displays _after_ exiting preconfiguration"),
probably others.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210129152351.161971-1-marcandre.lureau@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Marc-André Lureau 2021-01-29 19:23:51 +04:00 committed by Gerd Hoffmann
parent b577ab2dda
commit a652b12013
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ui/qemu-spice.h
View File

@ -28,6 +28,7 @@
void qemu_spice_input_init(void); void qemu_spice_input_init(void);
void qemu_spice_display_init(void); void qemu_spice_display_init(void);
void qemu_spice_display_init_done(void);
bool qemu_spice_have_display_interface(QemuConsole *con); bool qemu_spice_have_display_interface(QemuConsole *con);
int qemu_spice_add_display_interface(QXLInstance *qxlin, QemuConsole *con); int qemu_spice_add_display_interface(QXLInstance *qxlin, QemuConsole *con);
int qemu_spice_migrate_info(const char *hostname, int port, int tls_port, int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,

9
ui/spice-core.c
View File

@ -625,6 +625,14 @@ static void vm_change_state_handler(void *opaque, int running,
} }
} }
void qemu_spice_display_init_done(void)
{
if (runstate_is_running()) {
qemu_spice_display_start();
}
qemu_add_vm_change_state_handler(vm_change_state_handler, NULL);
}
static void qemu_spice_init(void) static void qemu_spice_init(void)
{ {
QemuOpts *opts = QTAILQ_FIRST(&qemu_spice_opts.head); QemuOpts *opts = QTAILQ_FIRST(&qemu_spice_opts.head);
@ -796,7 +804,6 @@ static void qemu_spice_init(void)
qemu_spice_input_init(); qemu_spice_input_init();
qemu_add_vm_change_state_handler(vm_change_state_handler, NULL);
qemu_spice_display_stop(); qemu_spice_display_stop();
g_free(x509_key_file); g_free(x509_key_file);

2
ui/spice-display.c
View File

@ -1188,4 +1188,6 @@ void qemu_spice_display_init(void)
} }
qemu_spice_display_init_one(con); qemu_spice_display_init_one(con);
} }
qemu_spice_display_init_done();
} }