From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDBrb-0002t0-SP for qemu-devel@nongnu.org; Mon, 19 Jan 2015 07:55:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDBrT-00045Z-3m for qemu-devel@nongnu.org; Mon, 19 Jan 2015 07:55:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49401) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDBrS-00045V-TP for qemu-devel@nongnu.org; Mon, 19 Jan 2015 07:55:19 -0500 From: Gerd Hoffmann Date: Mon, 19 Jan 2015 13:55:02 +0100 Message-Id: <1421672109-29467-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1421672109-29467-1-git-send-email-kraxel@redhat.com> References: <1421672109-29467-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 1/8] ui: Make qemu_default_pixman_format() return 0 on unsupported formats List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori From: Benjamin Herrenschmidt In order to remove the logic for detecting supported shared pixmap formats from device models, make qemu_default_pixman_format() capable for failing by returning 0 which is not a possible format value rather than asserting. Signed-off-by: Benjamin Herrenschmidt --- ui/qemu-pixman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c index 1f6fea5..6a889e9 100644 --- a/ui/qemu-pixman.c +++ b/ui/qemu-pixman.c @@ -84,7 +84,7 @@ pixman_format_code_t qemu_default_pixman_format(int bpp, bool native_endian) break; } } - g_assert_not_reached(); + return 0; } int qemu_pixman_get_type(int rshift, int gshift, int bshift) -- 1.8.3.1