diff mbox

[v2] qxl: use update_area_async in qxl-render

Message ID 1310057455-18570-15-git-send-email-alevy@redhat.com
State New
Headers show

Commit Message

Alon Levy July 7, 2011, 4:50 p.m. UTC 
---
 hw/qxl-render.c |    4 ++--
 hw/qxl.c        |   14 +++++---------
 hw/qxl.h        |    3 ---
 3 files changed, 7 insertions(+), 14 deletions(-)
diff mbox

Patch

diff --git a/hw/qxl-render.c b/hw/qxl-render.c
index 60b822d..8d847d0 100644
--- a/hw/qxl-render.c
+++ b/hw/qxl-render.c
@@ -124,8 +124,8 @@  void qxl_render_update(PCIQXLDevice *qxl)
     update.bottom = qxl->guest_primary.surface.height;
 
     memset(dirty, 0, sizeof(dirty));
-    qxl_spice_update_area(qxl, 0, &update,
-                          dirty, ARRAY_SIZE(dirty), 1);
+    qxl_spice_update_area_async(qxl, 0, &update,
+                          dirty, ARRAY_SIZE(dirty), 1, 1);
 
     for (i = 0; i < ARRAY_SIZE(dirty); i++) {
         if (qemu_spice_rect_is_empty(dirty+i)) {
diff --git a/hw/qxl.c b/hw/qxl.c
index 54ee5f5..c447e89 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -150,14 +150,6 @@  void qxl_spice_update_area_async(PCIQXLDevice *qxl, uint32_t surface_id,
     }
 }
 
-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_spice_update_area_async(qxl, surface_id, area, dirty_rects,
-                                num_dirty_rects, clear_dirty_region, 0);
-}
-
 static void qxl_spice_destroy_surface_wait_complete(PCIQXLDevice *qxl)
 {
     qemu_mutex_lock(&qxl->track_lock);
@@ -776,7 +768,11 @@  static void interface_async_complete(QXLInstance *sin, uint64_t cookie)
         qxl_spice_destroy_surface_wait_complete(qxl);
         break;
     }
-    qxl_send_events(qxl, QXL_INTERRUPT_IO_CMD);
+    if (current_async != QXL_IO_UPDATE_AREA_ASYNC || qxl->mode != QXL_MODE_VGA) {
+        qxl_send_events(qxl, QXL_INTERRUPT_IO_CMD);
+    } else {
+        dprint(qxl, 1, "in vga mode; update_area_async interrupt not sent\n");
+    }
 }
 
 static const QXLInterface qxl_interface = {
diff --git a/hw/qxl.h b/hw/qxl.h
index 23d6215..f02c28f 100644
--- a/hw/qxl.h
+++ b/hw/qxl.h
@@ -115,9 +115,6 @@  typedef struct PCIQXLDevice {
 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);
 void qxl_spice_update_area_async(PCIQXLDevice *qxl, uint32_t surface_id,
                            struct QXLRect *area, struct QXLRect *dirty_rects,
                            uint32_t num_dirty_rects, uint32_t clear_dirty_region,