a652b12013
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 commitsb4e1a34211("vl: remove separate preconfig main_loop") andfacf7c60ee("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>
62 lines
1.7 KiB
C
62 lines
1.7 KiB
C
/*
|
|
* Copyright (C) 2010 Red Hat, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 or
|
|
* (at your option) version 3 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef QEMU_SPICE_H
|
|
#define QEMU_SPICE_H
|
|
|
|
#include "qapi/error.h"
|
|
#include "ui/qemu-spice-module.h"
|
|
|
|
#ifdef CONFIG_SPICE
|
|
|
|
#include <spice.h>
|
|
#include "qemu/config-file.h"
|
|
|
|
void qemu_spice_input_init(void);
|
|
void qemu_spice_display_init(void);
|
|
void qemu_spice_display_init_done(void);
|
|
bool qemu_spice_have_display_interface(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,
|
|
const char *subject);
|
|
|
|
#if !defined(SPICE_SERVER_VERSION) || (SPICE_SERVER_VERSION < 0xc06)
|
|
#define SPICE_NEEDS_SET_MM_TIME 1
|
|
#else
|
|
#define SPICE_NEEDS_SET_MM_TIME 0
|
|
#endif
|
|
|
|
#else /* CONFIG_SPICE */
|
|
|
|
#include "qemu/error-report.h"
|
|
|
|
#define spice_displays 0
|
|
|
|
#endif /* CONFIG_SPICE */
|
|
|
|
static inline bool qemu_using_spice(Error **errp)
|
|
{
|
|
if (!using_spice) {
|
|
error_set(errp, ERROR_CLASS_DEVICE_NOT_ACTIVE,
|
|
"SPICE is not in use");
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
#endif /* QEMU_SPICE_H */
|