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>
147 lines
4.4 KiB
C
147 lines
4.4 KiB
C
#include "qemu-common.h"
|
|
|
|
#include "console.h"
|
|
#include "hw.h"
|
|
#include "pci.h"
|
|
#include "vga_int.h"
|
|
#include "qemu-thread.h"
|
|
|
|
#include "ui/qemu-spice.h"
|
|
#include "ui/spice-display.h"
|
|
|
|
enum qxl_mode {
|
|
QXL_MODE_UNDEFINED,
|
|
QXL_MODE_VGA,
|
|
QXL_MODE_COMPAT, /* spice 0.4.x */
|
|
QXL_MODE_NATIVE,
|
|
};
|
|
|
|
#define QXL_UNDEFINED_IO UINT32_MAX
|
|
|
|
#define QXL_NUM_DIRTY_RECTS 64
|
|
|
|
typedef struct PCIQXLDevice {
|
|
PCIDevice pci;
|
|
SimpleSpiceDisplay ssd;
|
|
int id;
|
|
uint32_t debug;
|
|
uint32_t guestdebug;
|
|
uint32_t cmdlog;
|
|
enum qxl_mode mode;
|
|
uint32_t cmdflags;
|
|
int generation;
|
|
uint32_t revision;
|
|
|
|
int32_t num_memslots;
|
|
int32_t num_surfaces;
|
|
|
|
uint32_t current_async;
|
|
QemuMutex async_lock;
|
|
|
|
struct guest_slots {
|
|
QXLMemSlot slot;
|
|
void *ptr;
|
|
uint64_t size;
|
|
uint64_t delta;
|
|
uint32_t active;
|
|
} guest_slots[NUM_MEMSLOTS];
|
|
|
|
struct guest_primary {
|
|
QXLSurfaceCreate surface;
|
|
uint32_t commands;
|
|
uint32_t resized;
|
|
int32_t qxl_stride;
|
|
uint32_t abs_stride;
|
|
uint32_t bits_pp;
|
|
uint32_t bytes_pp;
|
|
uint8_t *data;
|
|
} guest_primary;
|
|
|
|
struct surfaces {
|
|
QXLPHYSICAL cmds[NUM_SURFACES];
|
|
uint32_t count;
|
|
uint32_t max;
|
|
} guest_surfaces;
|
|
QXLPHYSICAL guest_cursor;
|
|
|
|
QemuMutex track_lock;
|
|
|
|
/* thread signaling */
|
|
QemuThread main;
|
|
int pipe[2];
|
|
|
|
/* ram pci bar */
|
|
QXLRam *ram;
|
|
VGACommonState vga;
|
|
uint32_t num_free_res;
|
|
QXLReleaseInfo *last_release;
|
|
uint32_t last_release_offset;
|
|
uint32_t oom_running;
|
|
|
|
/* rom pci bar */
|
|
QXLRom shadow_rom;
|
|
QXLRom *rom;
|
|
QXLModes *modes;
|
|
uint32_t rom_size;
|
|
MemoryRegion rom_bar;
|
|
|
|
/* vram pci bar */
|
|
uint32_t vram_size;
|
|
MemoryRegion vram_bar;
|
|
|
|
/* io bar */
|
|
MemoryRegion io_bar;
|
|
|
|
/* user-friendly properties (in megabytes) */
|
|
uint32_t ram_size_mb;
|
|
uint32_t vram_size_mb;
|
|
|
|
/* qxl_render_update state */
|
|
int render_update_cookie_num;
|
|
int num_dirty_rects;
|
|
QXLRect dirty[QXL_NUM_DIRTY_RECTS];
|
|
QEMUBH *update_area_bh;
|
|
} PCIQXLDevice;
|
|
|
|
#define PANIC_ON(x) if ((x)) { \
|
|
printf("%s: PANIC %s failed\n", __FUNCTION__, #x); \
|
|
abort(); \
|
|
}
|
|
|
|
#define dprint(_qxl, _level, _fmt, ...) \
|
|
do { \
|
|
if (_qxl->debug >= _level) { \
|
|
fprintf(stderr, "qxl-%d: ", _qxl->id); \
|
|
fprintf(stderr, _fmt, ## __VA_ARGS__); \
|
|
} \
|
|
} while (0)
|
|
|
|
#define QXL_DEFAULT_REVISION QXL_REVISION_STABLE_V10
|
|
|
|
/* qxl.c */
|
|
void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id);
|
|
void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg, ...);
|
|
|
|
void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id,
|
|
struct QXLRect *area, struct QXLRect *dirty_rects,
|
|
uint32_t num_dirty_rects,
|
|
uint32_t clear_dirty_region,
|
|
qxl_async_io async, QXLCookie *cookie);
|
|
void qxl_spice_loadvm_commands(PCIQXLDevice *qxl, struct QXLCommandExt *ext,
|
|
uint32_t count);
|
|
void qxl_spice_oom(PCIQXLDevice *qxl);
|
|
void qxl_spice_reset_memslots(PCIQXLDevice *qxl);
|
|
void qxl_spice_reset_image_cache(PCIQXLDevice *qxl);
|
|
void qxl_spice_reset_cursor(PCIQXLDevice *qxl);
|
|
|
|
/* qxl-logger.c */
|
|
void qxl_log_cmd_cursor(PCIQXLDevice *qxl, QXLCursorCmd *cmd, int group_id);
|
|
void qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext);
|
|
|
|
/* qxl-render.c */
|
|
void qxl_render_resize(PCIQXLDevice *qxl);
|
|
void qxl_render_update(PCIQXLDevice *qxl);
|
|
void qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext);
|
|
void qxl_render_update_area_done(PCIQXLDevice *qxl, QXLCookie *cookie);
|
|
void qxl_render_update_area_bh(void *opaque);
|