diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-18 07:56:18 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-18 07:56:18 -0500 |
| commit | 25b9e14e78bf9790cdee12d57c45898e86866a24 (patch) | |
| tree | 44170bfd10733c58e320f86b3998a3bc1ee07bc3 /trace-events | |
| parent | b26d712ecc9558fcd2a77a0b677a18d4919228bd (diff) | |
| parent | 06ddea49f8127bd055dbc7e83df896d9311c88cc (diff) | |
| download | qemu-25b9e14e78bf9790cdee12d57c45898e86866a24.zip qemu-25b9e14e78bf9790cdee12d57c45898e86866a24.tar.gz qemu-25b9e14e78bf9790cdee12d57c45898e86866a24.tar.bz2 | |
Merge remote-tracking branch 'spice/spice.v52' into staging
* spice/spice.v52:
qxl-render: fix broken vnc+spice since commit f934493
qxl: set default values of vram*_size_mb to -1
trace-events: remove unused qxl_vga_ioport_while_not_in_vga_mode
Diffstat (limited to 'trace-events')
| -rw-r--r-- | trace-events | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/trace-events b/trace-events index d2e7879..87cb96c 100644 --- a/trace-events +++ b/trace-events @@ -799,7 +799,6 @@ qxl_spice_reset_memslots(int qid) "%d" qxl_spice_update_area(int qid, uint32_t surface_id, uint32_t left, uint32_t right, uint32_t top, uint32_t bottom) "%d sid=%d [%d,%d,%d,%d]" qxl_spice_update_area_rest(int qid, uint32_t num_dirty_rects, uint32_t clear_dirty_region) "%d #d=%d clear=%d" qxl_surfaces_dirty(int qid, int surface, int offset, int size) "%d surface=%d offset=%d size=%d" -qxl_vga_ioport_while_not_in_vga_mode(int qid) "%d (int qid, reset to VGA mode because of VGA io)" # hw/qxl-render.c qxl_render_blit_guest_primary_initialized(void) "" |