qxl: add QXL_IO_MONITORS_CONFIG_ASYNC
Revision bumped to 4 for new IO support, enabled for spice-server >=
0.11.1. New io enabled if revision is 4. Revision can be set to 4.
[ kraxel: 3 continues to be the default revision. Once we have a new
stable spice-server release and the qemu patches to enable
the new bits merged we'll go flip the switch and make rev4
the default ]
This io calls the corresponding new spice api
spice_qxl_monitors_config_async to let spice-server read a new guest set
monitors config and notify the client.
On migration reissue spice_qxl_monitors_config_async.
RHBZ: 770842
Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
fixup
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Alon Levy
Gerd Hoffmann
parent
36839d355e
commit
020af1c45f
|
|
@ -2701,6 +2701,9 @@ EOF
|
|||
spice="yes"
|
||||
libs_softmmu="$libs_softmmu $spice_libs"
|
||||
QEMU_CFLAGS="$QEMU_CFLAGS $spice_cflags"
|
||||
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"
|
||||
|
|
@ -3438,6 +3441,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
|
||||
|
|
|
|||
97
hw/qxl.c
97
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
|
||||
|
|
@ -249,6 +254,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);
|
||||
|
|
@ -538,6 +576,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 +858,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 +934,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);
|
||||
|
|
@ -1315,6 +1357,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:
|
||||
|
|
@ -1334,7 +1383,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;
|
||||
|
|
@ -1362,6 +1411,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);
|
||||
|
|
@ -1503,6 +1553,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);
|
||||
}
|
||||
|
|
@ -1798,9 +1851,17 @@ static int qxl_init_common(PCIQXLDevice *qxl)
|
|||
io_size = 16;
|
||||
break;
|
||||
case 3: /* qxl-3 */
|
||||
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);
|
||||
|
|
@ -1999,7 +2060,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
|
||||
|
|
@ -2012,6 +2075,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,
|
||||
|
|
@ -2042,6 +2113,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,
|
||||
|
|
@ -2049,7 +2130,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),
|
||||
|
|
@ -2068,6 +2149,14 @@ static VMStateDescription qxl_vmstate = {
|
|||
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[] = {
|
||||
|
|
|
|||
7
hw/qxl.h
7
hw/qxl.h
|
|
@ -71,6 +71,8 @@ typedef struct PCIQXLDevice {
|
|||
} guest_surfaces;
|
||||
QXLPHYSICAL guest_cursor;
|
||||
|
||||
QXLPHYSICAL guest_monitors_config;
|
||||
|
||||
QemuMutex track_lock;
|
||||
|
||||
/* thread signaling */
|
||||
|
|
@ -128,7 +130,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);
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -51,6 +51,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 {
|
||||
|
|
|
|||
Loading…
Reference in New Issue