Use red_qxl_check_qxl_version in red-worker

Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Christophe Fergeau 2016-03-17 16:35:50 +01:00 committed by Frediano Ziglio
parent ae931c7dab
commit fe9977c469
3 changed files with 6 additions and 5 deletions

View File

@ -63,7 +63,7 @@ struct QXLState {
struct AsyncCommand *gl_draw_async;
};
static int red_qxl_check_qxl_version(QXLInstance *qxl, int major, int minor)
int red_qxl_check_qxl_version(QXLInstance *qxl, int major, int minor)
{
int qxl_major = qxl_get_interface(qxl)->base.major_version;
int qxl_minor = qxl_get_interface(qxl)->base.minor_version;

View File

@ -44,6 +44,7 @@ gboolean red_qxl_get_allow_client_mouse(QXLInstance *qxl, gint *x_res, gint *y_r
SpiceMsgDisplayGlScanoutUnix *red_qxl_get_gl_scanout(QXLInstance *qxl);
void red_qxl_put_gl_scanout(QXLInstance *qxl, SpiceMsgDisplayGlScanoutUnix *scanout);
void red_qxl_gl_draw_async_complete(QXLInstance *qxl);
int red_qxl_check_qxl_version(QXLInstance *qxl, int major, int minor);
SpiceServer* red_qxl_get_server(QXLState *qxl);
/* Wrappers around QXLInterface vfuncs */

View File

@ -510,10 +510,10 @@ static void guest_set_client_capabilities(RedWorker *worker)
};
QXLInterface *qif = qxl_get_interface(worker->qxl);
if (qif->base.major_version < 3 ||
(qif->base.major_version == 3 &&
qif->base.minor_version < 2) ||
!qif->set_client_capabilities) {
if (!red_qxl_check_qxl_version(worker->qxl, 3, 2)) {
return;
}
if (!qif->set_client_capabilities) {
return;
}
#define SET_CAP(a,c) \