From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:53623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj6Iq-0004i4-NW for qemu-devel@nongnu.org; Mon, 14 Jan 2019 12:45:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj6Ip-00085o-IG for qemu-devel@nongnu.org; Mon, 14 Jan 2019 12:45:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57000) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gj6Ip-00083i-6d for qemu-devel@nongnu.org; Mon, 14 Jan 2019 12:45:35 -0500 From: Thomas Huth Date: Mon, 14 Jan 2019 18:45:20 +0100 Message-Id: <1547487921-605-3-git-send-email-thuth@redhat.com> In-Reply-To: <1547487921-605-1-git-send-email-thuth@redhat.com> References: <1547487921-605-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 21/27] ui/console: Remove PixelFormat from qemu/typedefs.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Li Qiang From: Philippe Mathieu-Daud=C3=A9 Header files requiring PixelFormat already include "ui/qemu-pixman.h". To clean "qemu/typedefs.h", move the declaration to "ui/qemu-pixman.h" (removing the forward declaration). Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Gerd Hoffmann Signed-off-by: Thomas Huth --- include/qemu/typedefs.h | 1 - include/ui/console.h | 10 ---------- include/ui/qemu-pixman.h | 10 ++++++++++ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 38ec1fd..5d1a2d8 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -71,7 +71,6 @@ typedef struct PCIExpressHost PCIExpressHost; typedef struct PCIHostDeviceAddress PCIHostDeviceAddress; typedef struct PCIHostState PCIHostState; typedef struct PCMachineState PCMachineState; -typedef struct PixelFormat PixelFormat; typedef struct PostcopyDiscardState PostcopyDiscardState; typedef struct Property Property; typedef struct PropertyInfo PropertyInfo; diff --git a/include/ui/console.h b/include/ui/console.h index aa9f975..fef900d 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -121,16 +121,6 @@ struct QemuConsoleClass { =20 #define QEMU_ALLOCATED_FLAG 0x01 =20 -struct PixelFormat { - uint8_t bits_per_pixel; - uint8_t bytes_per_pixel; - uint8_t depth; /* color depth in bits */ - uint32_t rmask, gmask, bmask, amask; - uint8_t rshift, gshift, bshift, ashift; - uint8_t rmax, gmax, bmax, amax; - uint8_t rbits, gbits, bbits, abits; -}; - typedef struct DisplaySurface { pixman_format_code_t format; pixman_image_t *image; diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h index b7c82d1..0668109 100644 --- a/include/ui/qemu-pixman.h +++ b/include/ui/qemu-pixman.h @@ -53,6 +53,16 @@ =20 /* -------------------------------------------------------------------- = */ =20 +typedef struct PixelFormat { + uint8_t bits_per_pixel; + uint8_t bytes_per_pixel; + uint8_t depth; /* color depth in bits */ + uint32_t rmask, gmask, bmask, amask; + uint8_t rshift, gshift, bshift, ashift; + uint8_t rmax, gmax, bmax, amax; + uint8_t rbits, gbits, bbits, abits; +} PixelFormat; + PixelFormat qemu_pixelformat_from_pixman(pixman_format_code_t format); pixman_format_code_t qemu_default_pixman_format(int bpp, bool native_end= ian); pixman_format_code_t qemu_drm_format_to_pixman(uint32_t drm_format); --=20 1.8.3.1