From patchwork Fri Jan 11 14:08:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 10758097 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 556A86C5 for ; Fri, 11 Jan 2019 14:20:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4091F29D19 for ; Fri, 11 Jan 2019 14:20:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A45529DE9; Fri, 11 Jan 2019 14:20:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8802629D19 for ; Fri, 11 Jan 2019 14:20:27 +0000 (UTC) Received: from localhost ([127.0.0.1]:34515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghxfe-0007bE-DZ for patchwork-qemu-devel@patchwork.kernel.org; Fri, 11 Jan 2019 09:20:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghxdt-0005cP-Ds for qemu-devel@nongnu.org; Fri, 11 Jan 2019 09:18:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghxXW-0006sm-JM for qemu-devel@nongnu.org; Fri, 11 Jan 2019 09:12:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54904) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ghxXU-0006n8-Is; Fri, 11 Jan 2019 09:12:00 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C8BE332FB0; Fri, 11 Jan 2019 14:11:59 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-254.brq.redhat.com [10.40.204.254]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B9AE65D6A9; Fri, 11 Jan 2019 14:11:51 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Thomas Huth , qemu-devel@nongnu.org Date: Fri, 11 Jan 2019 15:08:55 +0100 Message-Id: <20190111140857.4211-14-philmd@redhat.com> In-Reply-To: <20190111140857.4211-1-philmd@redhat.com> References: <20190111140857.4211-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 11 Jan 2019 14:11:59 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 13/15] ui/console: Remove QemuDmaBuf from "qemu/typedefs.h" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Xiao Guangrong , qemu-block@nongnu.org, "Michael S. Tsirkin" , Laszlo Ersek , qemu-arm@nongnu.org, Gerd Hoffmann , Igor Mammedov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Files requiring QemuDmaBuf already include "ui/console.h". To clean "qemu/typedefs.h", move the declaration to "ui/console.h" (removing the forward declaration). Signed-off-by: Philippe Mathieu-Daudé --- include/qemu/typedefs.h | 1 - include/ui/console.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index e44f1473a5..55f4de7259 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -77,7 +77,6 @@ typedef struct QBool QBool; typedef struct QDict QDict; typedef struct QEMUBH QEMUBH; typedef struct QemuConsole QemuConsole; -typedef struct QemuDmaBuf QemuDmaBuf; typedef struct QEMUFile QEMUFile; typedef struct QemuLockable QemuLockable; typedef struct QemuMutex QemuMutex; diff --git a/include/ui/console.h b/include/ui/console.h index b74246f0f5..8396387c47 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -179,7 +179,7 @@ struct QEMUGLParams { int minor_ver; }; -struct QemuDmaBuf { +typedef struct QemuDmaBuf { int fd; uint32_t width; uint32_t height; @@ -187,7 +187,7 @@ struct QemuDmaBuf { uint32_t fourcc; uint32_t texture; bool y0_top; -}; +} QemuDmaBuf; typedef struct DisplayChangeListenerOps { const char *dpy_name;