From patchwork Thu Jul 7 16:50:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 103700 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5FF77B6F6F for ; Fri, 8 Jul 2011 03:14:20 +1000 (EST) Received: from localhost ([::1]:52165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qes9Z-0006H7-1g for incoming@patchwork.ozlabs.org; Thu, 07 Jul 2011 13:14:17 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qerx1-0003Vu-RJ for qemu-devel@nongnu.org; Thu, 07 Jul 2011 13:01:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QernR-00083B-KC for qemu-devel@nongnu.org; Thu, 07 Jul 2011 12:51:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QernQ-00082u-Ra for qemu-devel@nongnu.org; Thu, 07 Jul 2011 12:51:25 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p67GpNfa016030 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 7 Jul 2011 12:51:23 -0400 Received: from bow.redhat.com (vpn-11-30.rdu.redhat.com [10.11.11.30]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p67Gowx5012124; Thu, 7 Jul 2011 12:51:22 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Thu, 7 Jul 2011 18:50:55 +0200 Message-Id: <1310057455-18570-15-git-send-email-alevy@redhat.com> In-Reply-To: <1310057455-18570-1-git-send-email-alevy@redhat.com> References: <1310057455-18570-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: yhalperi@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH v2] qxl: use update_area_async in qxl-render X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- hw/qxl-render.c | 4 ++-- hw/qxl.c | 14 +++++--------- hw/qxl.h | 3 --- 3 files changed, 7 insertions(+), 14 deletions(-) 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,