From patchwork Thu Apr 4 07:28:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 233671 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 6E1932C00A2 for ; Thu, 4 Apr 2013 18:48:08 +1100 (EST) Received: from localhost ([::1]:34618 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNehF-0006x8-12 for incoming@patchwork.ozlabs.org; Thu, 04 Apr 2013 03:34:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNebm-0007J5-Ds for qemu-devel@nongnu.org; Thu, 04 Apr 2013 03:29:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNebg-0004v9-Jf for qemu-devel@nongnu.org; Thu, 04 Apr 2013 03:29:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13938) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNebg-0004up-BJ for qemu-devel@nongnu.org; Thu, 04 Apr 2013 03:29:12 -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 r347TBCX014357 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 4 Apr 2013 03:29:11 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-57.ams2.redhat.com [10.36.116.57]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r347T9Dm007456; Thu, 4 Apr 2013 03:29:11 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id E168E40EED; Thu, 4 Apr 2013 09:29:07 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 4 Apr 2013 09:28:59 +0200 Message-Id: <1365060546-24638-18-git-send-email-kraxel@redhat.com> In-Reply-To: <1365060546-24638-1-git-send-email-kraxel@redhat.com> References: <1365060546-24638-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 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] [PATCH 17/24] console: make DisplayState private to console.c 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 With gui_* being moved to console.c nobody outside console.c needs access to DisplayState fields any more. Make the struct private. Signed-off-by: Gerd Hoffmann --- include/ui/console.h | 8 -------- ui/console.c | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index d92626b..50cd7b0 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -182,14 +182,6 @@ struct DisplayChangeListener { QLIST_ENTRY(DisplayChangeListener) next; }; -struct DisplayState { - struct QEMUTimer *gui_timer; - bool have_gfx; - bool have_text; - - QLIST_HEAD(, DisplayChangeListener) listeners; -}; - DisplayState *init_displaystate(void); DisplaySurface* qemu_create_displaysurface_from(int width, int height, int bpp, int linesize, uint8_t *data, diff --git a/ui/console.c b/ui/console.c index 1ca50fc..ea8c218 100644 --- a/ui/console.c +++ b/ui/console.c @@ -157,6 +157,14 @@ struct QemuConsole { QEMUTimer *kbd_timer; }; +struct DisplayState { + struct QEMUTimer *gui_timer; + bool have_gfx; + bool have_text; + + QLIST_HEAD(, DisplayChangeListener) listeners; +}; + static DisplayState *display_state; static QemuConsole *active_console; static QemuConsole *consoles[MAX_CONSOLES];