81fb6f1504
RHBZ# 747011 Removes the last user of QXL_SYNC when using update drivers that use the _ASYNC io ports. The last user is qxl_render_update, it is called both by qxl_hw_update which is the vga_hw_update_ptr passed to graphic_console_init, and by qxl_hw_screen_dump. At the same time the QXLRect area being passed to the red_worker thread is passed as a copy, as part of the QXLCookie. The implementation uses interface_update_area_complete with a bh to make sure dpy_update and qxl_flip are called from the io thread, otherwise the vga->ds->surface.data can change under our feet. With this patch sdl+spice works fine. But spice by itself doesn't produce the expected screendumps unless repeated a few times, due to ppm_save being called before update_area (rendering done in spice server thread) having a chance to complete. Fixed by next patch, but see commit message for problem introduced by it. Signed-off-by: Alon Levy <alevy@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
134 lines
4.1 KiB
C
134 lines
4.1 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/>.
|
|
*/
|
|
|
|
#include <spice/ipc_ring.h>
|
|
#include <spice/enums.h>
|
|
#include <spice/qxl_dev.h>
|
|
|
|
#include "qemu-thread.h"
|
|
#include "console.h"
|
|
#include "pflib.h"
|
|
#include "sysemu.h"
|
|
|
|
#define NUM_MEMSLOTS 8
|
|
#define MEMSLOT_GENERATION_BITS 8
|
|
#define MEMSLOT_SLOT_BITS 8
|
|
|
|
#define MEMSLOT_GROUP_HOST 0
|
|
#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)
|
|
* version:
|
|
* QXL_SYNC: use the old version
|
|
* QXL_ASYNC: use the new version and make sure there are no two
|
|
* happening at the same time. This is used for guest initiated
|
|
* calls
|
|
*/
|
|
typedef enum qxl_async_io {
|
|
QXL_SYNC,
|
|
QXL_ASYNC,
|
|
} qxl_async_io;
|
|
|
|
enum {
|
|
QXL_COOKIE_TYPE_IO,
|
|
QXL_COOKIE_TYPE_RENDER_UPDATE_AREA,
|
|
};
|
|
|
|
typedef struct QXLCookie {
|
|
int type;
|
|
uint64_t io;
|
|
union {
|
|
uint32_t surface_id;
|
|
QXLRect area;
|
|
struct {
|
|
QXLRect area;
|
|
int redraw;
|
|
} render;
|
|
} u;
|
|
} QXLCookie;
|
|
|
|
QXLCookie *qxl_cookie_new(int type, uint64_t io);
|
|
|
|
typedef struct SimpleSpiceDisplay SimpleSpiceDisplay;
|
|
typedef struct SimpleSpiceUpdate SimpleSpiceUpdate;
|
|
|
|
struct SimpleSpiceDisplay {
|
|
DisplayState *ds;
|
|
void *buf;
|
|
int bufsize;
|
|
QXLWorker *worker;
|
|
QXLInstance qxl;
|
|
uint32_t unique;
|
|
QemuPfConv *conv;
|
|
|
|
QXLRect dirty;
|
|
int notify;
|
|
int running;
|
|
|
|
/*
|
|
* All struct members below this comment can be accessed from
|
|
* both spice server and qemu (iothread) context and any access
|
|
* to them must be protected by the lock.
|
|
*/
|
|
QemuMutex lock;
|
|
SimpleSpiceUpdate *update;
|
|
QEMUCursor *cursor;
|
|
int mouse_x, mouse_y;
|
|
};
|
|
|
|
struct SimpleSpiceUpdate {
|
|
QXLDrawable drawable;
|
|
QXLImage image;
|
|
QXLCommandExt ext;
|
|
uint8_t *bitmap;
|
|
};
|
|
|
|
int qemu_spice_rect_is_empty(const QXLRect* r);
|
|
void qemu_spice_rect_union(QXLRect *dest, const QXLRect *r);
|
|
|
|
void qemu_spice_destroy_update(SimpleSpiceDisplay *sdpy, SimpleSpiceUpdate *update);
|
|
void qemu_spice_create_host_memslot(SimpleSpiceDisplay *ssd);
|
|
void qemu_spice_create_host_primary(SimpleSpiceDisplay *ssd);
|
|
void qemu_spice_destroy_host_primary(SimpleSpiceDisplay *ssd);
|
|
void qemu_spice_vm_change_state_handler(void *opaque, int running,
|
|
RunState state);
|
|
void qemu_spice_display_init_common(SimpleSpiceDisplay *ssd, DisplayState *ds);
|
|
|
|
void qemu_spice_display_update(SimpleSpiceDisplay *ssd,
|
|
int x, int y, int w, int h);
|
|
void qemu_spice_display_resize(SimpleSpiceDisplay *ssd);
|
|
void qemu_spice_display_refresh(SimpleSpiceDisplay *ssd);
|
|
void qemu_spice_cursor_refresh_unlocked(SimpleSpiceDisplay *ssd);
|
|
|
|
void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *memslot,
|
|
qxl_async_io async);
|
|
void qemu_spice_del_memslot(SimpleSpiceDisplay *ssd, uint32_t gid,
|
|
uint32_t sid);
|
|
void qemu_spice_create_primary_surface(SimpleSpiceDisplay *ssd, uint32_t id,
|
|
QXLDevSurfaceCreate *surface,
|
|
qxl_async_io async);
|
|
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);
|