Merge branch 'spice.v59' of git://anongit.freedesktop.org/spice/qemu
* 'spice.v59' of git://anongit.freedesktop.org/spice/qemu: Remove #ifdef QXL_COMMAND_FLAG_COMPAT_16BPP qxl: Add set_client_capabilities() interface to QXLInterface spice: make number of surfaces runtime-configurable. configure: print spice-protocol and spice-server versions qxl: add QXL_IO_MONITORS_CONFIG_ASYNC qxl: disallow unknown revisions qxl/update_area_io: guest_bug on invalid parameters spice: increase the verbosity of spice section in "qemu --help" spice: adding seamless-migration option to the command line spice: add 'migrated' flag to spice info spice migration: add QEVENT_SPICE_MIGRATE_COMPLETED spice: notify on vm state change only via spice_server_vm_start/stop spice: notify spice server on vm start/stop spice: abort on invalid streaming cmdline params
This commit is contained in:
Aurelien Jarno
commit
69fc255350
|
|
@ -2701,6 +2701,11 @@ EOF
|
|||
spice="yes"
|
||||
libs_softmmu="$libs_softmmu $spice_libs"
|
||||
QEMU_CFLAGS="$QEMU_CFLAGS $spice_cflags"
|
||||
spice_protocol_version=$($pkg_config --modversion spice-protocol)
|
||||
spice_server_version=$($pkg_config --modversion spice-server)
|
||||
if $pkg_config --atleast-version=0.12.0 spice-protocol >/dev/null 2>&1; then
|
||||
spice_qxl_io_monitors_config_async="yes"
|
||||
fi
|
||||
else
|
||||
if test "$spice" = "yes" ; then
|
||||
feature_not_found "spice"
|
||||
|
|
@ -3156,7 +3161,7 @@ echo "libcap-ng support $cap_ng"
|
|||
echo "vhost-net support $vhost_net"
|
||||
echo "Trace backend $trace_backend"
|
||||
echo "Trace output file $trace_file-<pid>"
|
||||
echo "spice support $spice"
|
||||
echo "spice support $spice ($spice_protocol_version/$spice_server_version)"
|
||||
echo "rbd support $rbd"
|
||||
echo "xfsctl support $xfs"
|
||||
echo "nss used $smartcard_nss"
|
||||
|
|
@ -3438,6 +3443,10 @@ if test "$spice" = "yes" ; then
|
|||
echo "CONFIG_SPICE=y" >> $config_host_mak
|
||||
fi
|
||||
|
||||
if test "$spice_qxl_io_monitors_config_async" = "yes" ; then
|
||||
echo "CONFIG_QXL_IO_MONITORS_CONFIG_ASYNC=y" >> $config_host_mak
|
||||
fi
|
||||
|
||||
if test "$smartcard" = "yes" ; then
|
||||
echo "CONFIG_SMARTCARD=y" >> $config_host_mak
|
||||
fi
|
||||
|
|
|
|||
2
hmp.c
2
hmp.c
|
|
@ -414,6 +414,8 @@ void hmp_info_spice(Monitor *mon)
|
|||
monitor_printf(mon, " address: %s:%" PRId64 " [tls]\n",
|
||||
info->host, info->tls_port);
|
||||
}
|
||||
monitor_printf(mon, " migrated: %s\n",
|
||||
info->migrated ? "true" : "false");
|
||||
monitor_printf(mon, " auth: %s\n", info->auth);
|
||||
monitor_printf(mon, " compiled: %s\n", info->compiled_version);
|
||||
monitor_printf(mon, " mouse-mode: %s\n",
|
||||
|
|
|
|||
175
hw/qxl.c
175
hw/qxl.c
|
|
@ -27,6 +27,11 @@
|
|||
|
||||
#include "qxl.h"
|
||||
|
||||
#ifndef CONFIG_QXL_IO_MONITORS_CONFIG_ASYNC
|
||||
/* spice-protocol is too old, add missing definitions */
|
||||
#define QXL_IO_MONITORS_CONFIG_ASYNC (QXL_IO_FLUSH_RELEASE + 1)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* NOTE: SPICE_RING_PROD_ITEM accesses memory on the pci bar and as
|
||||
* such can be changed by the guest, so to avoid a guest trigerrable
|
||||
|
|
@ -231,7 +236,8 @@ static void qxl_spice_destroy_surfaces_complete(PCIQXLDevice *qxl)
|
|||
{
|
||||
trace_qxl_spice_destroy_surfaces_complete(qxl->id);
|
||||
qemu_mutex_lock(&qxl->track_lock);
|
||||
memset(&qxl->guest_surfaces.cmds, 0, sizeof(qxl->guest_surfaces.cmds));
|
||||
memset(qxl->guest_surfaces.cmds, 0,
|
||||
sizeof(qxl->guest_surfaces.cmds) * qxl->ssd.num_surfaces);
|
||||
qxl->guest_surfaces.count = 0;
|
||||
qemu_mutex_unlock(&qxl->track_lock);
|
||||
}
|
||||
|
|
@ -249,6 +255,39 @@ static void qxl_spice_destroy_surfaces(PCIQXLDevice *qxl, qxl_async_io async)
|
|||
}
|
||||
}
|
||||
|
||||
static void qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay)
|
||||
{
|
||||
trace_qxl_spice_monitors_config(qxl->id);
|
||||
/* 0x000b01 == 0.11.1 */
|
||||
#if SPICE_SERVER_VERSION >= 0x000b01 && \
|
||||
defined(CONFIG_QXL_IO_MONITORS_CONFIG_ASYNC)
|
||||
if (replay) {
|
||||
/*
|
||||
* don't use QXL_COOKIE_TYPE_IO:
|
||||
* - we are not running yet (post_load), we will assert
|
||||
* in send_events
|
||||
* - this is not a guest io, but a reply, so async_io isn't set.
|
||||
*/
|
||||
spice_qxl_monitors_config_async(&qxl->ssd.qxl,
|
||||
qxl->guest_monitors_config,
|
||||
MEMSLOT_GROUP_GUEST,
|
||||
(uintptr_t)qxl_cookie_new(
|
||||
QXL_COOKIE_TYPE_POST_LOAD_MONITORS_CONFIG,
|
||||
0));
|
||||
} else {
|
||||
qxl->guest_monitors_config = qxl->ram->monitors_config;
|
||||
spice_qxl_monitors_config_async(&qxl->ssd.qxl,
|
||||
qxl->ram->monitors_config,
|
||||
MEMSLOT_GROUP_GUEST,
|
||||
(uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_IO,
|
||||
QXL_IO_MONITORS_CONFIG_ASYNC));
|
||||
}
|
||||
#else
|
||||
fprintf(stderr, "qxl: too old spice-protocol/spice-server for "
|
||||
"QXL_IO_MONITORS_CONFIG_ASYNC\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
void qxl_spice_reset_image_cache(PCIQXLDevice *qxl)
|
||||
{
|
||||
trace_qxl_spice_reset_image_cache(qxl->id);
|
||||
|
|
@ -307,7 +346,7 @@ static void init_qxl_rom(PCIQXLDevice *d)
|
|||
rom->slot_id_bits = MEMSLOT_SLOT_BITS;
|
||||
rom->slots_start = 1;
|
||||
rom->slots_end = NUM_MEMSLOTS - 1;
|
||||
rom->n_surfaces = cpu_to_le32(NUM_SURFACES);
|
||||
rom->n_surfaces = cpu_to_le32(d->ssd.num_surfaces);
|
||||
|
||||
for (i = 0, n = 0; i < ARRAY_SIZE(qxl_modes); i++) {
|
||||
fb = qxl_modes[i].y_res * qxl_modes[i].stride;
|
||||
|
|
@ -411,9 +450,9 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext)
|
|||
}
|
||||
uint32_t id = le32_to_cpu(cmd->surface_id);
|
||||
|
||||
if (id >= NUM_SURFACES) {
|
||||
if (id >= qxl->ssd.num_surfaces) {
|
||||
qxl_set_guest_bug(qxl, "QXL_CMD_SURFACE id %d >= %d", id,
|
||||
NUM_SURFACES);
|
||||
qxl->ssd.num_surfaces);
|
||||
return 1;
|
||||
}
|
||||
qemu_mutex_lock(&qxl->track_lock);
|
||||
|
|
@ -489,7 +528,7 @@ static void interface_get_init_info(QXLInstance *sin, QXLDevInitInfo *info)
|
|||
info->num_memslots_groups = NUM_MEMSLOTS_GROUPS;
|
||||
info->internal_groupslot_id = 0;
|
||||
info->qxl_ram_size = le32_to_cpu(qxl->shadow_rom.num_pages) << TARGET_PAGE_BITS;
|
||||
info->n_surfaces = NUM_SURFACES;
|
||||
info->n_surfaces = qxl->ssd.num_surfaces;
|
||||
}
|
||||
|
||||
static const char *qxl_mode_to_string(int mode)
|
||||
|
|
@ -538,6 +577,7 @@ static const char *io_port_to_string(uint32_t io_port)
|
|||
= "QXL_IO_DESTROY_ALL_SURFACES_ASYNC",
|
||||
[QXL_IO_FLUSH_SURFACES_ASYNC] = "QXL_IO_FLUSH_SURFACES_ASYNC",
|
||||
[QXL_IO_FLUSH_RELEASE] = "QXL_IO_FLUSH_RELEASE",
|
||||
[QXL_IO_MONITORS_CONFIG_ASYNC] = "QXL_IO_MONITORS_CONFIG_ASYNC",
|
||||
};
|
||||
return io_port_to_string[io_port];
|
||||
}
|
||||
|
|
@ -819,6 +859,7 @@ static void interface_async_complete_io(PCIQXLDevice *qxl, QXLCookie *cookie)
|
|||
case QXL_IO_DESTROY_PRIMARY_ASYNC:
|
||||
case QXL_IO_UPDATE_AREA_ASYNC:
|
||||
case QXL_IO_FLUSH_SURFACES_ASYNC:
|
||||
case QXL_IO_MONITORS_CONFIG_ASYNC:
|
||||
break;
|
||||
case QXL_IO_CREATE_PRIMARY_ASYNC:
|
||||
qxl_create_guest_primary_complete(qxl);
|
||||
|
|
@ -894,6 +935,8 @@ static void interface_async_complete(QXLInstance *sin, uint64_t cookie_token)
|
|||
case QXL_COOKIE_TYPE_RENDER_UPDATE_AREA:
|
||||
qxl_render_update_area_done(qxl, cookie);
|
||||
break;
|
||||
case QXL_COOKIE_TYPE_POST_LOAD_MONITORS_CONFIG:
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "qxl: %s: unexpected cookie type %d\n",
|
||||
__func__, cookie->type);
|
||||
|
|
@ -901,6 +944,26 @@ static void interface_async_complete(QXLInstance *sin, uint64_t cookie_token)
|
|||
}
|
||||
}
|
||||
|
||||
#if SPICE_SERVER_VERSION >= 0x000b04
|
||||
|
||||
/* called from spice server thread context only */
|
||||
static void interface_set_client_capabilities(QXLInstance *sin,
|
||||
uint8_t client_present,
|
||||
uint8_t caps[58])
|
||||
{
|
||||
PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
|
||||
|
||||
qxl->shadow_rom.client_present = client_present;
|
||||
memcpy(qxl->shadow_rom.client_capabilities, caps, sizeof(caps));
|
||||
qxl->rom->client_present = client_present;
|
||||
memcpy(qxl->rom->client_capabilities, caps, sizeof(caps));
|
||||
qxl_rom_set_dirty(qxl);
|
||||
|
||||
qxl_send_events(qxl, QXL_INTERRUPT_CLIENT);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static const QXLInterface qxl_interface = {
|
||||
.base.type = SPICE_INTERFACE_QXL,
|
||||
.base.description = "qxl gpu",
|
||||
|
|
@ -922,6 +985,9 @@ static const QXLInterface qxl_interface = {
|
|||
.flush_resources = interface_flush_resources,
|
||||
.async_complete = interface_async_complete,
|
||||
.update_area_complete = interface_update_area_complete,
|
||||
#if SPICE_SERVER_VERSION >= 0x000b04
|
||||
.set_client_capabilities = interface_set_client_capabilities,
|
||||
#endif
|
||||
};
|
||||
|
||||
static void qxl_enter_vga_mode(PCIQXLDevice *d)
|
||||
|
|
@ -958,9 +1024,10 @@ static void qxl_update_irq(PCIQXLDevice *d)
|
|||
static void qxl_check_state(PCIQXLDevice *d)
|
||||
{
|
||||
QXLRam *ram = d->ram;
|
||||
int spice_display_running = qemu_spice_display_is_running(&d->ssd);
|
||||
|
||||
assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cmd_ring));
|
||||
assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cursor_ring));
|
||||
assert(!spice_display_running || SPICE_RING_IS_EMPTY(&ram->cmd_ring));
|
||||
assert(!spice_display_running || SPICE_RING_IS_EMPTY(&ram->cursor_ring));
|
||||
}
|
||||
|
||||
static void qxl_reset_state(PCIQXLDevice *d)
|
||||
|
|
@ -1292,11 +1359,9 @@ static void qxl_set_mode(PCIQXLDevice *d, int modenr, int loadvm)
|
|||
|
||||
d->mode = QXL_MODE_COMPAT;
|
||||
d->cmdflags = QXL_COMMAND_FLAG_COMPAT;
|
||||
#ifdef QXL_COMMAND_FLAG_COMPAT_16BPP /* new in spice 0.6.1 */
|
||||
if (mode->bits == 16) {
|
||||
d->cmdflags |= QXL_COMMAND_FLAG_COMPAT_16BPP;
|
||||
}
|
||||
#endif
|
||||
d->shadow_rom.mode = cpu_to_le32(modenr);
|
||||
d->rom->mode = cpu_to_le32(modenr);
|
||||
qxl_rom_set_dirty(d);
|
||||
|
|
@ -1314,6 +1379,13 @@ static void ioport_write(void *opaque, target_phys_addr_t addr,
|
|||
return;
|
||||
}
|
||||
|
||||
if (d->revision <= QXL_REVISION_STABLE_V10 &&
|
||||
io_port >= QXL_IO_FLUSH_SURFACES_ASYNC) {
|
||||
qxl_set_guest_bug(d, "unsupported io %d for revision %d\n",
|
||||
io_port, d->revision);
|
||||
return;
|
||||
}
|
||||
|
||||
switch (io_port) {
|
||||
case QXL_IO_RESET:
|
||||
case QXL_IO_SET_MODE:
|
||||
|
|
@ -1333,7 +1405,7 @@ static void ioport_write(void *opaque, target_phys_addr_t addr,
|
|||
io_port, io_port_to_string(io_port));
|
||||
/* be nice to buggy guest drivers */
|
||||
if (io_port >= QXL_IO_UPDATE_AREA_ASYNC &&
|
||||
io_port <= QXL_IO_DESTROY_ALL_SURFACES_ASYNC) {
|
||||
io_port < QXL_IO_RANGE_SIZE) {
|
||||
qxl_send_events(d, QXL_INTERRUPT_IO_CMD);
|
||||
}
|
||||
return;
|
||||
|
|
@ -1361,6 +1433,7 @@ static void ioport_write(void *opaque, target_phys_addr_t addr,
|
|||
io_port = QXL_IO_DESTROY_ALL_SURFACES;
|
||||
goto async_common;
|
||||
case QXL_IO_FLUSH_SURFACES_ASYNC:
|
||||
case QXL_IO_MONITORS_CONFIG_ASYNC:
|
||||
async_common:
|
||||
async = QXL_ASYNC;
|
||||
qemu_mutex_lock(&d->async_lock);
|
||||
|
|
@ -1385,6 +1458,18 @@ async_common:
|
|||
QXLCookie *cookie = NULL;
|
||||
QXLRect update = d->ram->update_area;
|
||||
|
||||
if (d->ram->update_surface > d->ssd.num_surfaces) {
|
||||
qxl_set_guest_bug(d, "QXL_IO_UPDATE_AREA: invalid surface id %d\n",
|
||||
d->ram->update_surface);
|
||||
return;
|
||||
}
|
||||
if (update.left >= update.right || update.top >= update.bottom) {
|
||||
qxl_set_guest_bug(d,
|
||||
"QXL_IO_UPDATE_AREA: invalid area (%ux%u)x(%ux%u)\n",
|
||||
update.left, update.top, update.right, update.bottom);
|
||||
return;
|
||||
}
|
||||
|
||||
if (async == QXL_ASYNC) {
|
||||
cookie = qxl_cookie_new(QXL_COOKIE_TYPE_IO,
|
||||
QXL_IO_UPDATE_AREA_ASYNC);
|
||||
|
|
@ -1466,7 +1551,7 @@ async_common:
|
|||
}
|
||||
break;
|
||||
case QXL_IO_DESTROY_SURFACE_WAIT:
|
||||
if (val >= NUM_SURFACES) {
|
||||
if (val >= d->ssd.num_surfaces) {
|
||||
qxl_set_guest_bug(d, "QXL_IO_DESTROY_SURFACE (async=%d):"
|
||||
"%" PRIu64 " >= NUM_SURFACES", async, val);
|
||||
goto cancel_async;
|
||||
|
|
@ -1490,6 +1575,9 @@ async_common:
|
|||
d->mode = QXL_MODE_UNDEFINED;
|
||||
qxl_spice_destroy_surfaces(d, async);
|
||||
break;
|
||||
case QXL_IO_MONITORS_CONFIG_ASYNC:
|
||||
qxl_spice_monitors_config_async(d, 0);
|
||||
break;
|
||||
default:
|
||||
qxl_set_guest_bug(d, "%s: unexpected ioport=0x%x\n", __func__, io_port);
|
||||
}
|
||||
|
|
@ -1538,7 +1626,7 @@ static void qxl_send_events(PCIQXLDevice *d, uint32_t events)
|
|||
uint32_t old_pending;
|
||||
uint32_t le_events = cpu_to_le32(events);
|
||||
|
||||
assert(d->ssd.running);
|
||||
assert(qemu_spice_display_is_running(&d->ssd));
|
||||
old_pending = __sync_fetch_and_or(&d->ram->int_pending, le_events);
|
||||
if ((old_pending & le_events) == le_events) {
|
||||
return;
|
||||
|
|
@ -1642,7 +1730,7 @@ static void qxl_dirty_surfaces(PCIQXLDevice *qxl)
|
|||
vram_start = (intptr_t)memory_region_get_ram_ptr(&qxl->vram_bar);
|
||||
|
||||
/* dirty the off-screen surfaces */
|
||||
for (i = 0; i < NUM_SURFACES; i++) {
|
||||
for (i = 0; i < qxl->ssd.num_surfaces; i++) {
|
||||
QXLSurfaceCmd *cmd;
|
||||
intptr_t surface_offset;
|
||||
int surface_size;
|
||||
|
|
@ -1770,7 +1858,6 @@ static int qxl_init_common(PCIQXLDevice *qxl)
|
|||
qxl->mode = QXL_MODE_UNDEFINED;
|
||||
qxl->generation = 1;
|
||||
qxl->num_memslots = NUM_MEMSLOTS;
|
||||
qxl->num_surfaces = NUM_SURFACES;
|
||||
qemu_mutex_init(&qxl->track_lock);
|
||||
qemu_mutex_init(&qxl->async_lock);
|
||||
qxl->current_async = QXL_UNDEFINED_IO;
|
||||
|
|
@ -1786,10 +1873,21 @@ static int qxl_init_common(PCIQXLDevice *qxl)
|
|||
io_size = 16;
|
||||
break;
|
||||
case 3: /* qxl-3 */
|
||||
default:
|
||||
pci_device_rev = QXL_DEFAULT_REVISION;
|
||||
pci_device_rev = QXL_REVISION_STABLE_V10;
|
||||
io_size = 32; /* PCI region size must be pow2 */
|
||||
break;
|
||||
/* 0x000b01 == 0.11.1 */
|
||||
#if SPICE_SERVER_VERSION >= 0x000b01 && \
|
||||
defined(CONFIG_QXL_IO_MONITORS_CONFIG_ASYNC)
|
||||
case 4: /* qxl-4 */
|
||||
pci_device_rev = QXL_REVISION_STABLE_V12;
|
||||
io_size = msb_mask(QXL_IO_RANGE_SIZE * 2 - 1);
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
error_report("Invalid revision %d for qxl device (max %d)",
|
||||
qxl->revision, QXL_DEFAULT_REVISION);
|
||||
return -1;
|
||||
}
|
||||
|
||||
pci_set_byte(&config[PCI_REVISION_ID], pci_device_rev);
|
||||
|
|
@ -1801,6 +1899,7 @@ static int qxl_init_common(PCIQXLDevice *qxl)
|
|||
init_qxl_rom(qxl);
|
||||
init_qxl_ram(qxl);
|
||||
|
||||
qxl->guest_surfaces.cmds = g_new0(QXLPHYSICAL, qxl->ssd.num_surfaces);
|
||||
memory_region_init_ram(&qxl->vram_bar, "qxl.vram", qxl->vram_size);
|
||||
vmstate_register_ram(&qxl->vram_bar, &qxl->pci.qdev);
|
||||
memory_region_init_alias(&qxl->vram32_bar, "qxl.vram32", &qxl->vram_bar,
|
||||
|
|
@ -1966,8 +2065,8 @@ static int qxl_post_load(void *opaque, int version)
|
|||
qxl_create_guest_primary(d, 1, QXL_SYNC);
|
||||
|
||||
/* replay surface-create and cursor-set commands */
|
||||
cmds = g_malloc0(sizeof(QXLCommandExt) * (NUM_SURFACES + 1));
|
||||
for (in = 0, out = 0; in < NUM_SURFACES; in++) {
|
||||
cmds = g_malloc0(sizeof(QXLCommandExt) * (d->ssd.num_surfaces + 1));
|
||||
for (in = 0, out = 0; in < d->ssd.num_surfaces; in++) {
|
||||
if (d->guest_surfaces.cmds[in] == 0) {
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1984,7 +2083,9 @@ static int qxl_post_load(void *opaque, int version)
|
|||
}
|
||||
qxl_spice_loadvm_commands(d, cmds, out);
|
||||
g_free(cmds);
|
||||
|
||||
if (d->guest_monitors_config) {
|
||||
qxl_spice_monitors_config_async(d, 1);
|
||||
}
|
||||
break;
|
||||
case QXL_MODE_COMPAT:
|
||||
/* note: no need to call qxl_create_memslots, qxl_set_mode
|
||||
|
|
@ -1997,6 +2098,14 @@ static int qxl_post_load(void *opaque, int version)
|
|||
|
||||
#define QXL_SAVE_VERSION 21
|
||||
|
||||
static bool qxl_monitors_config_needed(void *opaque)
|
||||
{
|
||||
PCIQXLDevice *qxl = opaque;
|
||||
|
||||
return qxl->guest_monitors_config != 0;
|
||||
}
|
||||
|
||||
|
||||
static VMStateDescription qxl_memslot = {
|
||||
.name = "qxl-memslot",
|
||||
.version_id = QXL_SAVE_VERSION,
|
||||
|
|
@ -2027,6 +2136,16 @@ static VMStateDescription qxl_surface = {
|
|||
}
|
||||
};
|
||||
|
||||
static VMStateDescription qxl_vmstate_monitors_config = {
|
||||
.name = "qxl/monitors-config",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_UINT64(guest_monitors_config, PCIQXLDevice),
|
||||
VMSTATE_END_OF_LIST()
|
||||
},
|
||||
};
|
||||
|
||||
static VMStateDescription qxl_vmstate = {
|
||||
.name = "qxl",
|
||||
.version_id = QXL_SAVE_VERSION,
|
||||
|
|
@ -2034,7 +2153,7 @@ static VMStateDescription qxl_vmstate = {
|
|||
.pre_save = qxl_pre_save,
|
||||
.pre_load = qxl_pre_load,
|
||||
.post_load = qxl_post_load,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_PCI_DEVICE(pci, PCIQXLDevice),
|
||||
VMSTATE_STRUCT(vga, PCIQXLDevice, 0, vmstate_vga_common, VGACommonState),
|
||||
VMSTATE_UINT32(shadow_rom.mode, PCIQXLDevice),
|
||||
|
|
@ -2047,12 +2166,21 @@ static VMStateDescription qxl_vmstate = {
|
|||
qxl_memslot, struct guest_slots),
|
||||
VMSTATE_STRUCT(guest_primary.surface, PCIQXLDevice, 0,
|
||||
qxl_surface, QXLSurfaceCreate),
|
||||
VMSTATE_INT32_EQUAL(num_surfaces, PCIQXLDevice),
|
||||
VMSTATE_ARRAY(guest_surfaces.cmds, PCIQXLDevice, NUM_SURFACES, 0,
|
||||
vmstate_info_uint64, uint64_t),
|
||||
VMSTATE_INT32_EQUAL(ssd.num_surfaces, PCIQXLDevice),
|
||||
VMSTATE_VARRAY_INT32(guest_surfaces.cmds, PCIQXLDevice,
|
||||
ssd.num_surfaces, 0,
|
||||
vmstate_info_uint64, uint64_t),
|
||||
VMSTATE_UINT64(guest_cursor, PCIQXLDevice),
|
||||
VMSTATE_END_OF_LIST()
|
||||
},
|
||||
.subsections = (VMStateSubsection[]) {
|
||||
{
|
||||
.vmsd = &qxl_vmstate_monitors_config,
|
||||
.needed = qxl_monitors_config_needed,
|
||||
}, {
|
||||
/* empty */
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static Property qxl_properties[] = {
|
||||
|
|
@ -2069,6 +2197,7 @@ static Property qxl_properties[] = {
|
|||
DEFINE_PROP_UINT32("vram_size_mb", PCIQXLDevice, vram32_size_mb, -1),
|
||||
DEFINE_PROP_UINT32("vram64_size_mb", PCIQXLDevice, vram_size_mb, -1),
|
||||
DEFINE_PROP_UINT32("vgamem_mb", PCIQXLDevice, vgamem_size_mb, 16),
|
||||
DEFINE_PROP_INT32("surfaces", PCIQXLDevice, ssd.num_surfaces, 1024),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
|
|
|
|||
10
hw/qxl.h
10
hw/qxl.h
|
|
@ -40,7 +40,6 @@ typedef struct PCIQXLDevice {
|
|||
uint32_t revision;
|
||||
|
||||
int32_t num_memslots;
|
||||
int32_t num_surfaces;
|
||||
|
||||
uint32_t current_async;
|
||||
QemuMutex async_lock;
|
||||
|
|
@ -65,12 +64,14 @@ typedef struct PCIQXLDevice {
|
|||
} guest_primary;
|
||||
|
||||
struct surfaces {
|
||||
QXLPHYSICAL cmds[NUM_SURFACES];
|
||||
QXLPHYSICAL *cmds;
|
||||
uint32_t count;
|
||||
uint32_t max;
|
||||
} guest_surfaces;
|
||||
QXLPHYSICAL guest_cursor;
|
||||
|
||||
QXLPHYSICAL guest_monitors_config;
|
||||
|
||||
QemuMutex track_lock;
|
||||
|
||||
/* thread signaling */
|
||||
|
|
@ -128,7 +129,12 @@ typedef struct PCIQXLDevice {
|
|||
} \
|
||||
} while (0)
|
||||
|
||||
#if 0
|
||||
/* spice-server 0.12 is still in development */
|
||||
#define QXL_DEFAULT_REVISION QXL_REVISION_STABLE_V12
|
||||
#else
|
||||
#define QXL_DEFAULT_REVISION QXL_REVISION_STABLE_V10
|
||||
#endif
|
||||
|
||||
/* qxl.c */
|
||||
void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id);
|
||||
|
|
|
|||
|
|
@ -455,6 +455,7 @@ static const char *monitor_event_names[] = {
|
|||
[QEVENT_SUSPEND_DISK] = "SUSPEND_DISK",
|
||||
[QEVENT_WAKEUP] = "WAKEUP",
|
||||
[QEVENT_BALLOON_CHANGE] = "BALLOON_CHANGE",
|
||||
[QEVENT_SPICE_MIGRATE_COMPLETED] = "SPICE_MIGRATE_COMPLETED",
|
||||
};
|
||||
QEMU_BUILD_BUG_ON(ARRAY_SIZE(monitor_event_names) != QEVENT_MAX)
|
||||
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ typedef enum MonitorEvent {
|
|||
QEVENT_SUSPEND_DISK,
|
||||
QEVENT_WAKEUP,
|
||||
QEVENT_BALLOON_CHANGE,
|
||||
QEVENT_SPICE_MIGRATE_COMPLETED,
|
||||
|
||||
/* Add to 'monitor_event_names' array in monitor.c when
|
||||
* defining new events here */
|
||||
|
|
|
|||
|
|
@ -808,6 +808,9 @@
|
|||
#
|
||||
# @enabled: true if the SPICE server is enabled, false otherwise
|
||||
#
|
||||
# @migrated: true if the last guest migration completed and spice
|
||||
# migration had completed as well. false otherwise.
|
||||
#
|
||||
# @host: #optional The hostname the SPICE server is bound to. This depends on
|
||||
# the name resolution on the host and may be an IP address.
|
||||
#
|
||||
|
|
@ -833,7 +836,7 @@
|
|||
# Since: 0.14.0
|
||||
##
|
||||
{ 'type': 'SpiceInfo',
|
||||
'data': {'enabled': 'bool', '*host': 'str', '*port': 'int',
|
||||
'data': {'enabled': 'bool', 'migrated': 'bool', '*host': 'str', '*port': 'int',
|
||||
'*tls-port': 'int', '*auth': 'str', '*compiled-version': 'str',
|
||||
'mouse-mode': 'SpiceQueryMouseMode', '*channels': ['SpiceChannel']} }
|
||||
|
||||
|
|
|
|||
|
|
@ -537,6 +537,9 @@ QemuOptsList qemu_spice_opts = {
|
|||
},{
|
||||
.name = "playback-compression",
|
||||
.type = QEMU_OPT_BOOL,
|
||||
}, {
|
||||
.name = "seamless-migration",
|
||||
.type = QEMU_OPT_BOOL,
|
||||
},
|
||||
{ /* end of list */ }
|
||||
},
|
||||
|
|
|
|||
|
|
@ -838,7 +838,23 @@ Enable SDL.
|
|||
ETEXI
|
||||
|
||||
DEF("spice", HAS_ARG, QEMU_OPTION_spice,
|
||||
"-spice <args> enable spice\n", QEMU_ARCH_ALL)
|
||||
"-spice [port=port][,tls-port=secured-port][,x509-dir=<dir>]\n"
|
||||
" [,x509-key-file=<file>][,x509-key-password=<file>]\n"
|
||||
" [,x509-cert-file=<file>][,x509-cacert-file=<file>]\n"
|
||||
" [,x509-dh-key-file=<file>][,addr=addr][,ipv4|ipv6]\n"
|
||||
" [,tls-ciphers=<list>]\n"
|
||||
" [,tls-channel=[main|display|cursor|inputs|record|playback]]\n"
|
||||
" [,plaintext-channel=[main|display|cursor|inputs|record|playback]]\n"
|
||||
" [,sasl][,password=<secret>][,disable-ticketing]\n"
|
||||
" [,image-compression=[auto_glz|auto_lz|quic|glz|lz|off]]\n"
|
||||
" [,jpeg-wan-compression=[auto|never|always]]\n"
|
||||
" [,zlib-glz-wan-compression=[auto|never|always]]\n"
|
||||
" [,streaming-video=[off|all|filter]][,disable-copy-paste]\n"
|
||||
" [,agent-mouse=[on|off]][,playback-compression=[on|off]]\n"
|
||||
" [,seamless-migration=[on|off]]\n"
|
||||
" enable spice\n"
|
||||
" at least one of {port, tls-port} is mandatory\n",
|
||||
QEMU_ARCH_ALL)
|
||||
STEXI
|
||||
@item -spice @var{option}[,@var{option}[,...]]
|
||||
@findex -spice
|
||||
|
|
@ -920,6 +936,9 @@ Enable/disable passing mouse events via vdagent. Default is on.
|
|||
@item playback-compression=[on|off]
|
||||
Enable/disable audio stream compression (using celt 0.5.1). Default is on.
|
||||
|
||||
@item seamless-migration=[on|off]
|
||||
Enable/disable spice seamless migration. Default is off.
|
||||
|
||||
@end table
|
||||
ETEXI
|
||||
|
||||
|
|
|
|||
|
|
@ -956,6 +956,7 @@ qxl_spice_destroy_surfaces(int qid, int async) "%d async=%d"
|
|||
qxl_spice_destroy_surface_wait_complete(int qid, uint32_t id) "%d sid=%d"
|
||||
qxl_spice_destroy_surface_wait(int qid, uint32_t id, int async) "%d sid=%d async=%d"
|
||||
qxl_spice_flush_surfaces_async(int qid, uint32_t surface_count, uint32_t num_free_res) "%d s#=%d, res#=%d"
|
||||
qxl_spice_monitors_config(int id) "%d"
|
||||
qxl_spice_loadvm_commands(int qid, void *ext, uint32_t count) "%d ext=%p count=%d"
|
||||
qxl_spice_oom(int qid) "%d"
|
||||
qxl_spice_reset_cursor(int qid) "%d"
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
#include "migration.h"
|
||||
#include "monitor.h"
|
||||
#include "hw/hw.h"
|
||||
#include "spice-display.h"
|
||||
|
||||
/* core bits */
|
||||
|
||||
|
|
@ -45,6 +46,7 @@ static Notifier migration_state;
|
|||
static const char *auth = "spice";
|
||||
static char *auth_passwd;
|
||||
static time_t auth_expires = TIME_MAX;
|
||||
static int spice_migration_completed;
|
||||
int using_spice = 0;
|
||||
|
||||
static QemuThread me;
|
||||
|
|
@ -284,6 +286,7 @@ typedef struct SpiceMigration {
|
|||
} SpiceMigration;
|
||||
|
||||
static void migrate_connect_complete_cb(SpiceMigrateInstance *sin);
|
||||
static void migrate_end_complete_cb(SpiceMigrateInstance *sin);
|
||||
|
||||
static const SpiceMigrateInterface migrate_interface = {
|
||||
.base.type = SPICE_INTERFACE_MIGRATION,
|
||||
|
|
@ -291,7 +294,7 @@ static const SpiceMigrateInterface migrate_interface = {
|
|||
.base.major_version = SPICE_INTERFACE_MIGRATION_MAJOR,
|
||||
.base.minor_version = SPICE_INTERFACE_MIGRATION_MINOR,
|
||||
.migrate_connect_complete = migrate_connect_complete_cb,
|
||||
.migrate_end_complete = NULL,
|
||||
.migrate_end_complete = migrate_end_complete_cb,
|
||||
};
|
||||
|
||||
static SpiceMigration spice_migrate;
|
||||
|
|
@ -304,6 +307,12 @@ static void migrate_connect_complete_cb(SpiceMigrateInstance *sin)
|
|||
}
|
||||
sm->connect_complete.cb = NULL;
|
||||
}
|
||||
|
||||
static void migrate_end_complete_cb(SpiceMigrateInstance *sin)
|
||||
{
|
||||
monitor_protocol_event(QEVENT_SPICE_MIGRATE_COMPLETED, NULL);
|
||||
spice_migration_completed = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* config string parsing */
|
||||
|
|
@ -344,7 +353,8 @@ static const char *stream_video_names[] = {
|
|||
[ SPICE_STREAM_VIDEO_FILTER ] = "filter",
|
||||
};
|
||||
#define parse_stream_video(_name) \
|
||||
name2enum(_name, stream_video_names, ARRAY_SIZE(stream_video_names))
|
||||
parse_name(_name, "stream video control", \
|
||||
stream_video_names, ARRAY_SIZE(stream_video_names))
|
||||
|
||||
static const char *compression_names[] = {
|
||||
[ SPICE_IMAGE_COMPRESS_OFF ] = "off",
|
||||
|
|
@ -435,6 +445,7 @@ SpiceInfo *qmp_query_spice(Error **errp)
|
|||
}
|
||||
|
||||
info->enabled = true;
|
||||
info->migrated = spice_migration_completed;
|
||||
|
||||
addr = qemu_opt_get(opts, "addr");
|
||||
port = qemu_opt_get_number(opts, "port", 0);
|
||||
|
|
@ -487,6 +498,8 @@ static void migration_state_notifier(Notifier *notifier, void *data)
|
|||
} else if (migration_has_finished(s)) {
|
||||
#ifndef SPICE_INTERFACE_MIGRATION
|
||||
spice_server_migrate_switch(spice_server);
|
||||
monitor_protocol_event(QEVENT_SPICE_MIGRATE_COMPLETED, NULL);
|
||||
spice_migration_completed = true;
|
||||
#else
|
||||
spice_server_migrate_end(spice_server, true);
|
||||
} else if (migration_has_failed(s)) {
|
||||
|
|
@ -545,6 +558,20 @@ static int add_channel(const char *name, const char *value, void *opaque)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void vm_change_state_handler(void *opaque, int running,
|
||||
RunState state)
|
||||
{
|
||||
#if SPICE_SERVER_VERSION >= 0x000b02 /* 0.11.2 */
|
||||
if (running) {
|
||||
qemu_spice_display_start();
|
||||
spice_server_vm_start(spice_server);
|
||||
} else {
|
||||
spice_server_vm_stop(spice_server);
|
||||
qemu_spice_display_stop();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void qemu_spice_init(void)
|
||||
{
|
||||
QemuOpts *opts = QTAILQ_FIRST(&qemu_spice_opts.head);
|
||||
|
|
@ -558,6 +585,9 @@ void qemu_spice_init(void)
|
|||
int port, tls_port, len, addr_flags;
|
||||
spice_image_compression_t compression;
|
||||
spice_wan_compression_t wan_compr;
|
||||
#if SPICE_SERVER_VERSION >= 0x000b02 /* 0.11.2 */
|
||||
bool seamless_migration;
|
||||
#endif
|
||||
|
||||
qemu_thread_get_self(&me);
|
||||
|
||||
|
|
@ -701,6 +731,10 @@ void qemu_spice_init(void)
|
|||
spice_server_set_uuid(spice_server, qemu_uuid);
|
||||
#endif
|
||||
|
||||
#if SPICE_SERVER_VERSION >= 0x000b02 /* 0.11.2 */
|
||||
seamless_migration = qemu_opt_get_bool(opts, "seamless-migration", 0);
|
||||
spice_server_set_seamless_migration(spice_server, seamless_migration);
|
||||
#endif
|
||||
if (0 != spice_server_init(spice_server, &core_interface)) {
|
||||
error_report("failed to initialize spice server");
|
||||
exit(1);
|
||||
|
|
@ -718,6 +752,8 @@ 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);
|
||||
|
||||
g_free(x509_key_file);
|
||||
g_free(x509_cert_file);
|
||||
g_free(x509_cacert_file);
|
||||
|
|
@ -740,6 +776,7 @@ int qemu_spice_add_interface(SpiceBaseInstance *sin)
|
|||
spice_server = spice_server_new();
|
||||
spice_server_init(spice_server, &core_interface);
|
||||
}
|
||||
|
||||
return spice_server_add_interface(spice_server, sin);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
@ -289,6 +317,9 @@ void qemu_spice_display_init_common(SimpleSpiceDisplay *ssd, DisplayState *ds)
|
|||
qemu_mutex_init(&ssd->lock);
|
||||
ssd->mouse_x = -1;
|
||||
ssd->mouse_y = -1;
|
||||
if (ssd->num_surfaces == 0) {
|
||||
ssd->num_surfaces = 1024;
|
||||
}
|
||||
ssd->bufsize = (16 * 1024 * 1024);
|
||||
ssd->buf = g_malloc(ssd->bufsize);
|
||||
}
|
||||
|
|
@ -399,7 +430,7 @@ static void interface_get_init_info(QXLInstance *sin, QXLDevInitInfo *info)
|
|||
info->num_memslots_groups = NUM_MEMSLOTS_GROUPS;
|
||||
info->internal_groupslot_id = 0;
|
||||
info->qxl_ram_size = ssd->bufsize;
|
||||
info->n_surfaces = NUM_SURFACES;
|
||||
info->n_surfaces = ssd->num_surfaces;
|
||||
}
|
||||
|
||||
static int interface_get_command(QXLInstance *sin, struct QXLCommandExt *ext)
|
||||
|
|
|
|||
|
|
@ -32,8 +32,6 @@
|
|||
#define MEMSLOT_GROUP_GUEST 1
|
||||
#define NUM_MEMSLOTS_GROUPS 2
|
||||
|
||||
#define NUM_SURFACES 1024
|
||||
|
||||
/*
|
||||
* Internal enum to differenciate between options for
|
||||
* io calls that have a sync (old) version and an _async (new)
|
||||
|
|
@ -51,6 +49,7 @@ typedef enum qxl_async_io {
|
|||
enum {
|
||||
QXL_COOKIE_TYPE_IO,
|
||||
QXL_COOKIE_TYPE_RENDER_UPDATE_AREA,
|
||||
QXL_COOKIE_TYPE_POST_LOAD_MONITORS_CONFIG,
|
||||
};
|
||||
|
||||
typedef struct QXLCookie {
|
||||
|
|
@ -79,10 +78,13 @@ struct SimpleSpiceDisplay {
|
|||
QXLInstance qxl;
|
||||
uint32_t unique;
|
||||
QemuPfConv *conv;
|
||||
int32_t num_surfaces;
|
||||
|
||||
QXLRect dirty;
|
||||
int notify;
|
||||
#if SPICE_SERVER_VERSION < 0x000b02 /* before 0.11.2 */
|
||||
int running;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* All struct members below this comment can be accessed from
|
||||
|
|
@ -129,5 +131,8 @@ void qemu_spice_create_primary_surface(SimpleSpiceDisplay *ssd, uint32_t id,
|
|||
void qemu_spice_destroy_primary_surface(SimpleSpiceDisplay *ssd,
|
||||
uint32_t id, qxl_async_io async);
|
||||
void qemu_spice_wakeup(SimpleSpiceDisplay *ssd);
|
||||
void qemu_spice_start(SimpleSpiceDisplay *ssd);
|
||||
void qemu_spice_stop(SimpleSpiceDisplay *ssd);
|
||||
#if SPICE_SERVER_VERSION >= 0x000b02 /* before 0.11.2 */
|
||||
void qemu_spice_display_start(void);
|
||||
void qemu_spice_display_stop(void);
|
||||
#endif
|
||||
int qemu_spice_display_is_running(SimpleSpiceDisplay *ssd);
|
||||
|
|
|
|||
Loading…
Reference in New Issue