From patchwork Fri Mar 1 09:00:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 224257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4B0182C029D for ; Fri, 1 Mar 2013 20:04:28 +1100 (EST) Received: from localhost ([::1]:53813 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBLtC-0000uP-CF for incoming@patchwork.ozlabs.org; Fri, 01 Mar 2013 04:04:26 -0500 Received: from eggs.gnu.org ([208.118.235.92]:43532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBLph-0003nz-UK for qemu-devel@nongnu.org; Fri, 01 Mar 2013 04:00:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UBLpf-00030n-IS for qemu-devel@nongnu.org; Fri, 01 Mar 2013 04:00:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64459) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBLpf-00030Z-9N for qemu-devel@nongnu.org; Fri, 01 Mar 2013 04:00:47 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2190kwG019497 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 1 Mar 2013 04:00:46 -0500 Received: from rincewind.home.kraxel.org (ovpn-116-72.ams2.redhat.com [10.36.116.72]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2190iPI000946; Fri, 1 Mar 2013 04:00:45 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id AAF13406CA; Fri, 1 Mar 2013 10:00:43 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2013 10:00:34 +0100 Message-Id: <1362128443-15687-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1362128443-15687-1-git-send-email-kraxel@redhat.com> References: <1362128443-15687-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Gerd Hoffmann Subject: [Qemu-devel] [RfC PATCH 03/12] spice: zap sdpy global 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 DisplayChangeListener is passed now to all DisplayChangeListenerOps callbacks, so we can use that to access the spice display state and kill the sdpy global variable. Signed-off-by: Gerd Hoffmann --- ui/spice-display.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/ui/spice-display.c b/ui/spice-display.c index b6528fa..b2bda23 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -581,25 +581,26 @@ static const QXLInterface dpy_interface = { .client_monitors_config = interface_client_monitors_config, }; -static SimpleSpiceDisplay sdpy; - static void display_update(DisplayChangeListener *dcl, struct DisplayState *ds, int x, int y, int w, int h) { - qemu_spice_display_update(&sdpy, x, y, w, h); + SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl); + qemu_spice_display_update(ssd, x, y, w, h); } static void display_resize(DisplayChangeListener *dcl, struct DisplayState *ds) { - qemu_spice_display_resize(&sdpy); + SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl); + qemu_spice_display_resize(ssd); } static void display_refresh(DisplayChangeListener *dcl, struct DisplayState *ds) { - qemu_spice_display_refresh(&sdpy); + SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl); + qemu_spice_display_refresh(ssd); } static const DisplayChangeListenerOps display_listener_ops = { @@ -611,16 +612,17 @@ static const DisplayChangeListenerOps display_listener_ops = { void qemu_spice_display_init(DisplayState *ds) { - assert(sdpy.ds == NULL); - qemu_spice_display_init_common(&sdpy, ds); + SimpleSpiceDisplay *ssd = g_new0(SimpleSpiceDisplay, 1); + + qemu_spice_display_init_common(ssd, ds); - sdpy.qxl.base.sif = &dpy_interface.base; - qemu_spice_add_interface(&sdpy.qxl.base); - assert(sdpy.worker); + ssd->qxl.base.sif = &dpy_interface.base; + qemu_spice_add_interface(&ssd->qxl.base); + assert(ssd->worker); - qemu_spice_create_host_memslot(&sdpy); - qemu_spice_create_host_primary(&sdpy); + qemu_spice_create_host_memslot(ssd); + qemu_spice_create_host_primary(ssd); - sdpy.dcl.ops = &display_listener_ops; - register_displaychangelistener(ds, &sdpy.dcl); + ssd->dcl.ops = &display_listener_ops; + register_displaychangelistener(ds, &ssd->dcl); }