From patchwork Wed Jul 6 12:19:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 103461 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 B7F0EB6F7E for ; Wed, 6 Jul 2011 22:23:22 +1000 (EST) Received: from localhost ([::1]:46125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeR8R-0001dD-4x for incoming@patchwork.ozlabs.org; Wed, 06 Jul 2011 08:23:19 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeR4u-0001bw-Lw for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeR4s-0005Au-7F for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27231) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeR4r-0005Am-1p for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:37 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p66CJaTM006258 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 6 Jul 2011 08:19:36 -0400 Received: from bow.redhat.com (vpn-10-220.rdu.redhat.com [10.11.10.220]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p66CJR0k022836; Wed, 6 Jul 2011 08:19:35 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Wed, 6 Jul 2011 14:19:13 +0200 Message-Id: <1309954766-9728-5-git-send-email-alevy@redhat.com> In-Reply-To: <1309954766-9728-1-git-send-email-alevy@redhat.com> References: <1309954766-9728-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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] spice: lock spice worker calls 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 From: Gerd Hoffmann ... so we can call them from a thread. Signed-off-by: Gerd Hoffmann --- ui/spice-display.c | 31 +++++++++++++++++++++++++++++++ ui/spice-display.h | 1 + 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/ui/spice-display.c b/ui/spice-display.c index fef1758..93ebc19 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -67,80 +67,110 @@ void qemu_spice_update_area(SimpleSpiceDisplay *ssd, uint32_t surface_id, struct QXLRect *area, struct QXLRect *dirty_rects, uint32_t num_dirty_rects, uint32_t clear_dirty_region) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->update_area(ssd->worker, surface_id, area, dirty_rects, num_dirty_rects, clear_dirty_region); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_add_memslot(SimpleSpiceDisplay *ssd, QXLDevMemSlot *memslot) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->add_memslot(ssd->worker, memslot); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_del_memslot(SimpleSpiceDisplay *ssd, uint32_t gid, uint32_t sid) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->del_memslot(ssd->worker, gid, sid); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_create_primary_surface(SimpleSpiceDisplay *ssd, uint32_t id, QXLDevSurfaceCreate *surface) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->create_primary_surface(ssd->worker, id, surface); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_destroy_primary_surface(SimpleSpiceDisplay *ssd, uint32_t id) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->destroy_primary_surface(ssd->worker, id); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_destroy_surface_wait(SimpleSpiceDisplay *ssd, uint32_t id) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->destroy_surface_wait(ssd->worker, id); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_loadvm_commands(SimpleSpiceDisplay *ssd, struct QXLCommandExt *ext, uint32_t count) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->loadvm_commands(ssd->worker, ext, count); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_wakeup(SimpleSpiceDisplay *ssd) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->wakeup(ssd->worker); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_oom(SimpleSpiceDisplay *ssd) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->oom(ssd->worker); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_start(SimpleSpiceDisplay *ssd) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->start(ssd->worker); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_stop(SimpleSpiceDisplay *ssd) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->stop(ssd->worker); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_reset_memslots(SimpleSpiceDisplay *ssd) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->reset_memslots(ssd->worker); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_destroy_surfaces(SimpleSpiceDisplay *ssd) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->destroy_surfaces(ssd->worker); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_reset_image_cache(SimpleSpiceDisplay *ssd) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->reset_image_cache(ssd->worker); + qemu_mutex_unlock(&ssd->wlock); } void qemu_spice_reset_cursor(SimpleSpiceDisplay *ssd) { + qemu_mutex_lock(&ssd->wlock); ssd->worker->reset_cursor(ssd->worker); + qemu_mutex_unlock(&ssd->wlock); } @@ -289,6 +319,7 @@ void qemu_spice_display_init_common(SimpleSpiceDisplay *ssd, DisplayState *ds) { ssd->ds = ds; qemu_mutex_init(&ssd->lock); + qemu_mutex_init(&ssd->wlock); ssd->mouse_x = -1; ssd->mouse_y = -1; ssd->bufsize = (16 * 1024 * 1024); diff --git a/ui/spice-display.h b/ui/spice-display.h index a39b19d..3968d75 100644 --- a/ui/spice-display.h +++ b/ui/spice-display.h @@ -41,6 +41,7 @@ struct SimpleSpiceDisplay { void *buf; int bufsize; QXLWorker *worker; + QemuMutex wlock; QXLInstance qxl; uint32_t unique; QemuPfConv *conv;