From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695047396; cv=none; d=zohomail.com; s=zohoarc; b=HRNtCDSfuiPPEshIvKPckQ1YyzYplE4RUBa6aYFGybKk4GhaFY/8IUf/oma5Dgq8OlMpfW/BDu9aNzYrsNGs8QE9EYgK+p9I/39bX4gHXVEdusbMOPCtlG37mgiu5cBwlxmNnHRPxX70VS0FTjl6a1Ji0cOv8dmj0hzhDRvOWKw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695047396; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jCrA3e8yuydcAyBZPCyz9ojYbjub4NprIdCYgs0ND7c=; b=mPIUt0+bX7FdBUQ332cKeiSTjIAxPPI6/RXtgOVDq/mks6VCuz1KYqVgioLE0ermARfubAFf046KAdlpfz35TsfGQVVjo08bziRGNWwTtQveCyJDCIQ7qM8EYowE77EBA8tY7PMf/yEmD8skDel5f4VHw1teX5oY8bwLguRMI54= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695047396458362.0116309688334; Mon, 18 Sep 2023 07:29:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgB-0005iM-QN; Mon, 18 Sep 2023 09:52:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEg9-0005hZ-PA for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEfm-0000RE-RK for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:45 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-650-P8a-QoH1OYetel3qGCoNhQ-1; Mon, 18 Sep 2023 09:52:15 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 68508801779; Mon, 18 Sep 2023 13:52:14 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BE4D20268CB; Mon, 18 Sep 2023 13:52:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jCrA3e8yuydcAyBZPCyz9ojYbjub4NprIdCYgs0ND7c=; b=Ef9e57mex+JFfW+L4uYkFjzTSB1HaEsU9OlOhD6Q1Od5wlEmVxzVcREwj2q9ZbwvxeSMxQ VfC0LqtATwNBshNHNhBX25Bt6Lzqxk9X/xhl2h7S2O9JQIKoS0j0nyRuEmlZus+jNEqiFg FMmrHAbAoEpmiKDhp5D/KGkIQFZKZA0= X-MC-Unique: P8a-QoH1OYetel3qGCoNhQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Subject: [PATCH v2 01/18] build-sys: add a "pixman" feature Date: Mon, 18 Sep 2023 17:51:48 +0400 Message-ID: <20230918135206.2739222-2-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695047397193100001 From: Marc-Andr=C3=A9 Lureau For now, pixman is mandatory, but we set config_host.h and Kconfig. Once compilation is fixed, "pixman" will become actually optional. Signed-off-by: Marc-Andr=C3=A9 Lureau --- meson.build | 10 ++++++++-- include/ui/qemu-pixman.h | 2 ++ Kconfig.host | 3 +++ meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 3 +++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 5150a74831..e870b039cc 100644 --- a/meson.build +++ b/meson.build @@ -828,10 +828,14 @@ if 'ust' in get_option('trace_backends') method: 'pkg-config') endif pixman =3D not_found -if have_system or have_tools - pixman =3D dependency('pixman-1', required: have_system, version:'>=3D0.= 21.8', +if not get_option('pixman').auto() or have_system or have_tools + pixman =3D dependency('pixman-1', required: get_option('pixman'), versio= n:'>=3D0.21.8', method: 'pkg-config') endif +if not pixman.found() + error('FIXME: pixman is currently required') +endif + zlib =3D dependency('zlib', required: true) =20 libaio =3D not_found @@ -2124,6 +2128,7 @@ config_host_data.set('CONFIG_SECCOMP', seccomp.found(= )) if seccomp.found() config_host_data.set('CONFIG_SECCOMP_SYSRAWRC', seccomp_has_sysrawrc) endif +config_host_data.set('CONFIG_PIXMAN', pixman.found()) config_host_data.set('CONFIG_SNAPPY', snappy.found()) config_host_data.set('CONFIG_SOLARIS', targetos =3D=3D 'sunos') if get_option('tcg').allowed() @@ -2843,6 +2848,7 @@ have_ivshmem =3D config_host_data.get('CONFIG_EVENTFD= ') host_kconfig =3D \ (get_option('fuzzing') ? ['CONFIG_FUZZ=3Dy'] : []) + \ (have_tpm ? ['CONFIG_TPM=3Dy'] : []) + \ + (pixman.found() ? ['CONFIG_PIXMAN=3Dy'] : []) + \ (spice.found() ? ['CONFIG_SPICE=3Dy'] : []) + \ (have_ivshmem ? ['CONFIG_IVSHMEM=3Dy'] : []) + \ (opengl.found() ? ['CONFIG_OPENGL=3Dy'] : []) + \ diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h index 51f8709327..b3379f6625 100644 --- a/include/ui/qemu-pixman.h +++ b/include/ui/qemu-pixman.h @@ -6,11 +6,13 @@ #ifndef QEMU_PIXMAN_H #define QEMU_PIXMAN_H =20 +#ifdef CONFIG_PIXMAN /* pixman-0.16.0 headers have a redundant declaration */ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wredundant-decls" #include #pragma GCC diagnostic pop +#endif =20 /* * pixman image formats are defined to be native endian, diff --git a/Kconfig.host b/Kconfig.host index d763d89269..b6ac2b9316 100644 --- a/Kconfig.host +++ b/Kconfig.host @@ -11,6 +11,9 @@ config OPENGL config X11 bool =20 +config PIXMAN + bool + config SPICE bool =20 diff --git a/meson_options.txt b/meson_options.txt index f82d88b7c6..1aaec02d68 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -218,6 +218,8 @@ option('l2tpv3', type : 'feature', value : 'auto', description: 'l2tpv3 network backend support') option('netmap', type : 'feature', value : 'auto', description: 'netmap network backend support') +option('pixman', type : 'feature', value : 'auto', + description: 'pixman support') option('slirp', type: 'feature', value: 'auto', description: 'libslirp user mode network backend support') option('vde', type : 'feature', value : 'auto', diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index e1d178370c..d016caf819 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -147,6 +147,7 @@ meson_options_help() { printf "%s\n" ' pa PulseAudio sound support' printf "%s\n" ' parallels parallels image format support' printf "%s\n" ' pipewire PipeWire sound support' + printf "%s\n" ' pixman pixman support' printf "%s\n" ' png PNG support with libpng' printf "%s\n" ' pvrdma Enable PVRDMA support' printf "%s\n" ' qcow1 qcow1 image format support' @@ -398,6 +399,8 @@ _meson_option_parse() { --disable-parallels) printf "%s" -Dparallels=3Ddisabled ;; --enable-pipewire) printf "%s" -Dpipewire=3Denabled ;; --disable-pipewire) printf "%s" -Dpipewire=3Ddisabled ;; + --enable-pixman) printf "%s" -Dpixman=3Denabled ;; + --disable-pixman) printf "%s" -Dpixman=3Ddisabled ;; --with-pkgversion=3D*) quote_sh "-Dpkgversion=3D$2" ;; --enable-plugins) printf "%s" -Dplugins=3Dtrue ;; --disable-plugins) printf "%s" -Dplugins=3Dfalse ;; --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695050059; cv=none; d=zohomail.com; s=zohoarc; b=Ffw3uh0XJ+WJACZjcCZTyabzSTpfYPIAs6r0p4QeyZ/hq2i6rQ04CAy+ElUw/qyJr6kfJH6+/VHTzYzYvN9EXvMIeGQCryLhrJYigR9Jv4pL7xz800k4ZVj4XxchEDGMK91CDdng5XcLbf/TbYWMNKp6OS46DzJdlbYHnPmd/BY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695050059; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CieSxx89gmOW3l5IwrPycPYU4Zv/fMb/WqXnoA13wlY=; b=PF+LStKxCe57OQeWAdU7RxNRWXJAhWB4VCUd6bIKT7pO8KWZTgooomXXxVEYncs5llUNp+0E6dhZTA6f7BOMv+AqC8dI25stjCuaXZYfhc58qQjNNg4V6RmsxxEvE7f1a8UdTbSy5NVtJjeUsSOuyIV/2aUlfpDLSrK4oXONu64= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169505005982790.7493808127955; Mon, 18 Sep 2023 08:14:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgE-0005nD-FO; Mon, 18 Sep 2023 09:52:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEg9-0005ha-SB for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEfq-0000Ri-An for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:45 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-152-iLoYbZKeMXe_p2zahwZ5EA-1; Mon, 18 Sep 2023 09:52:21 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 95CE329AA3BF; Mon, 18 Sep 2023 13:52:18 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8895614027B9; Mon, 18 Sep 2023 13:52:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CieSxx89gmOW3l5IwrPycPYU4Zv/fMb/WqXnoA13wlY=; b=Ssmifn28tWgafvucMyeErZsC36jKyh5AX9NiJuHSAQkwAdal9BI7xF3iTWOIz+Pzc5wR7q J236k4Kxc3eZIQ9h423o8HJ9ps6XkbbTayt/KRb2fF6pc2dnUuoS6SxqR71I7/ICmnzQj4 1JeP1Ijm93yrY+cyfHE6TfiJOmO9+GI= X-MC-Unique: iLoYbZKeMXe_p2zahwZ5EA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 02/18] ui: compile out some qemu-pixman functions when !PIXMAN Date: Mon, 18 Sep 2023 17:51:49 +0400 Message-ID: <20230918135206.2739222-3-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695050061420100003 From: Marc-Andr=C3=A9 Lureau Those functions require the PIXMAN library. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/ui/qemu-pixman.h | 7 +++++-- ui/qemu-pixman.c | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h index b3379f6625..539c089f1d 100644 --- a/include/ui/qemu-pixman.h +++ b/include/ui/qemu-pixman.h @@ -72,17 +72,17 @@ pixman_format_code_t qemu_default_pixman_format(int bpp= , bool native_endian); pixman_format_code_t qemu_drm_format_to_pixman(uint32_t drm_format); uint32_t qemu_pixman_to_drm_format(pixman_format_code_t pixman); int qemu_pixman_get_type(int rshift, int gshift, int bshift); -pixman_format_code_t qemu_pixman_get_format(PixelFormat *pf); bool qemu_pixman_check_format(DisplayChangeListener *dcl, pixman_format_code_t format); =20 +#ifdef CONFIG_PIXMAN +pixman_format_code_t qemu_pixman_get_format(PixelFormat *pf); pixman_image_t *qemu_pixman_linebuf_create(pixman_format_code_t format, int width); void qemu_pixman_linebuf_fill(pixman_image_t *linebuf, pixman_image_t *fb, int width, int x, int y); pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format, pixman_image_t *image); -void qemu_pixman_image_unref(pixman_image_t *image); =20 pixman_image_t *qemu_pixman_glyph_from_vgafont(int height, const uint8_t *= font, unsigned int ch); @@ -91,6 +91,9 @@ void qemu_pixman_glyph_render(pixman_image_t *glyph, pixman_color_t *fgcol, pixman_color_t *bgcol, int x, int y, int cw, int ch); +#endif + +void qemu_pixman_image_unref(pixman_image_t *image); =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(pixman_image_t, qemu_pixman_image_unref) =20 diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c index be00a96340..4272a43744 100644 --- a/ui/qemu-pixman.c +++ b/ui/qemu-pixman.c @@ -143,6 +143,7 @@ int qemu_pixman_get_type(int rshift, int gshift, int bs= hift) return type; } =20 +#ifdef CONFIG_PIXMAN pixman_format_code_t qemu_pixman_get_format(PixelFormat *pf) { pixman_format_code_t format; @@ -156,6 +157,7 @@ pixman_format_code_t qemu_pixman_get_format(PixelFormat= *pf) } return format; } +#endif =20 /* * Return true for known-good pixman conversions. @@ -184,6 +186,7 @@ bool qemu_pixman_check_format(DisplayChangeListener *dc= l, } } =20 +#ifdef CONFIG_PIXMAN pixman_image_t *qemu_pixman_linebuf_create(pixman_format_code_t format, int width) { @@ -209,6 +212,7 @@ pixman_image_t *qemu_pixman_mirror_create(pixman_format= _code_t format, NULL, pixman_image_get_stride(image)); } +#endif =20 void qemu_pixman_image_unref(pixman_image_t *image) { @@ -218,6 +222,7 @@ void qemu_pixman_image_unref(pixman_image_t *image) pixman_image_unref(image); } =20 +#ifdef CONFIG_PIXMAN pixman_image_t *qemu_pixman_glyph_from_vgafont(int height, const uint8_t *= font, unsigned int ch) { @@ -260,3 +265,4 @@ void qemu_pixman_glyph_render(pixman_image_t *glyph, pixman_image_unref(ifg); pixman_image_unref(ibg); } +#endif /* CONFIG_PIXMAN */ --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695046372; cv=none; d=zohomail.com; s=zohoarc; b=OYs8A+2GZUqfnj6nl1hKc+2A7g8eox+kmoU4ODULUyL2g2DsLhQJZJEg0Kj1aGbUEO0rwYu0gzyHDgVp98iDj/zlP0NRxrrUSBE21RfhAHQRW4ktlcgVsA4f9Xg9KckOeH8ylUZRoZI3kIv3ho8sOFQzIXPb/4CsdbCJMWDCtpk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695046372; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OmceWz+fW/f6mW7ArQcdXxETusp17PAPVXGQctgkm7E=; b=VGojv7hGU5Je/W7LueyLUudHSXM6UHB4V8/vnyY6Fkw3w4UVZVsC2HaQyiljcK+3W9TSO8nGZ/bDm3sO4R45kRwFusK1DfgOxeh8Erx3Q8y3Eo9AmzAkvQladFbfu9TUx+lUaPOPjT+QSoWezWSapiS57YfYEUCmr5x6X++DgLQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695046372152331.94799779742107; Mon, 18 Sep 2023 07:12:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgG-0005rZ-U6; Mon, 18 Sep 2023 09:52:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgF-0005of-4z for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEft-0000SQ-LM for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:49 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-167-tP0eUp4aOv2dP3eiHe1XYQ-1; Mon, 18 Sep 2023 09:52:24 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C59811019C9E; Mon, 18 Sep 2023 13:52:22 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D00F2156701; Mon, 18 Sep 2023 13:52:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OmceWz+fW/f6mW7ArQcdXxETusp17PAPVXGQctgkm7E=; b=I2mZMADVIDdW5h5QyuGMulViCt/h/dZJMAzRYzzQ9qXur+brF2SvAnHDl6xQqzQnkdhAET l03QgV2ODaIrPbkfcxJM/TQwZC/i7fmrz5ex/IMjGOEoDYjtO7Quh5sg3EgPdm34i3APKo rAJBurQAQD4Mo7IOlk6EfPQPWTNA5Pw= X-MC-Unique: tP0eUp4aOv2dP3eiHe1XYQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 03/18] ui: add pixman-compat.h Date: Mon, 18 Sep 2023 17:51:50 +0400 Message-ID: <20230918135206.2739222-4-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695046373836100007 From: Marc-Andr=C3=A9 Lureau This is a tiny subset of PIXMAN API that is used pervasively in QEMU codebase to manage images and identify the underlying format. It doesn't seems worth to wrap this in a QEMU-specific API. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/ui/pixman-compat.h | 190 +++++++++++++++++++++++++++++++++++++ include/ui/qemu-pixman.h | 2 + 2 files changed, 192 insertions(+) create mode 100644 include/ui/pixman-compat.h diff --git a/include/ui/pixman-compat.h b/include/ui/pixman-compat.h new file mode 100644 index 0000000000..e511c8b946 --- /dev/null +++ b/include/ui/pixman-compat.h @@ -0,0 +1,190 @@ +/* + * SPDX-License-Identifier: MIT + * + * Tiny subset of PIXMAN API commonly used by QEMU. + * + * Copyright 1987, 1988, 1989, 1998 The Open Group + * Copyright 1987, 1988, 1989 Digital Equipment Corporation + * Copyright 1999, 2004, 2008 Keith Packard + * Copyright 2000 SuSE, Inc. + * Copyright 2000 Keith Packard, member of The XFree86 Project, Inc. + * Copyright 2004, 2005, 2007, 2008, 2009, 2010 Red Hat, Inc. + * Copyright 2004 Nicholas Miell + * Copyright 2005 Lars Knoll & Zack Rusin, Trolltech + * Copyright 2005 Trolltech AS + * Copyright 2007 Luca Barbato + * Copyright 2008 Aaron Plattner, NVIDIA Corporation + * Copyright 2008 Rodrigo Kumpera + * Copyright 2008 Andr=C3=A9 Tupinamb=C3=A1 + * Copyright 2008 Mozilla Corporation + * Copyright 2008 Frederic Plourde + * Copyright 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright 2009, 2010 Nokia Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software= "), + * to deal in the Software without restriction, including without limitati= on + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the ne= xt + * paragraph) shall be included in all copies or substantial portions of t= he + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef PIXMAN_COMPAT_H +#define PIXMAN_COMPAT_H + +#define PIXMAN_TYPE_OTHER 0 +#define PIXMAN_TYPE_ARGB 2 +#define PIXMAN_TYPE_ABGR 3 +#define PIXMAN_TYPE_BGRA 8 +#define PIXMAN_TYPE_RGBA 9 + +#define PIXMAN_FORMAT(bpp,type,a,r,g,b) (((bpp) << 24) | \ + ((type) << 16) | \ + ((a) << 12) | \ + ((r) << 8) | \ + ((g) << 4) | \ + ((b))) + +#define PIXMAN_FORMAT_RESHIFT(val, ofs, num) \ + (((val >> (ofs)) & ((1 << (num)) - 1)) << ((val >> 22) & 3)) + +#define PIXMAN_FORMAT_BPP(f) PIXMAN_FORMAT_RESHIFT(f, 24, 8) +#define PIXMAN_FORMAT_TYPE(f) (((f) >> 16) & 0x3f) +#define PIXMAN_FORMAT_A(f) PIXMAN_FORMAT_RESHIFT(f, 12, 4) +#define PIXMAN_FORMAT_R(f) PIXMAN_FORMAT_RESHIFT(f, 8, 4) +#define PIXMAN_FORMAT_G(f) PIXMAN_FORMAT_RESHIFT(f, 4, 4) +#define PIXMAN_FORMAT_B(f) PIXMAN_FORMAT_RESHIFT(f, 0, 4) +#define PIXMAN_FORMAT_DEPTH(f) (PIXMAN_FORMAT_A(f) + \ + PIXMAN_FORMAT_R(f) + \ + PIXMAN_FORMAT_G(f) + \ + PIXMAN_FORMAT_B(f)) + +typedef enum { + /* 32bpp formats */ + PIXMAN_a8r8g8b8 =3D PIXMAN_FORMAT(32,PIXMAN_TYPE_ARGB,8,8,8,8), + PIXMAN_x8r8g8b8 =3D PIXMAN_FORMAT(32,PIXMAN_TYPE_ARGB,0,8,8,8), + PIXMAN_a8b8g8r8 =3D PIXMAN_FORMAT(32,PIXMAN_TYPE_ABGR,8,8,8,8), + PIXMAN_x8b8g8r8 =3D PIXMAN_FORMAT(32,PIXMAN_TYPE_ABGR,0,8,8,8), + PIXMAN_b8g8r8a8 =3D PIXMAN_FORMAT(32,PIXMAN_TYPE_BGRA,8,8,8,8), + PIXMAN_b8g8r8x8 =3D PIXMAN_FORMAT(32,PIXMAN_TYPE_BGRA,0,8,8,8), + PIXMAN_r8g8b8a8 =3D PIXMAN_FORMAT(32,PIXMAN_TYPE_RGBA,8,8,8,8), + PIXMAN_r8g8b8x8 =3D PIXMAN_FORMAT(32,PIXMAN_TYPE_RGBA,0,8,8,8), + /* 24bpp formats */ + PIXMAN_r8g8b8 =3D PIXMAN_FORMAT(24,PIXMAN_TYPE_ARGB,0,8,8,8), + PIXMAN_b8g8r8 =3D PIXMAN_FORMAT(24,PIXMAN_TYPE_ABGR,0,8,8,8), + /* 16bpp formats */ + PIXMAN_r5g6b5 =3D PIXMAN_FORMAT(16,PIXMAN_TYPE_ARGB,0,5,6,5), + PIXMAN_a1r5g5b5 =3D PIXMAN_FORMAT(16,PIXMAN_TYPE_ARGB,1,5,5,5), + PIXMAN_x1r5g5b5 =3D PIXMAN_FORMAT(16,PIXMAN_TYPE_ARGB,0,5,5,5), +} pixman_format_code_t; + +typedef struct pixman_image pixman_image_t; + +typedef void (* pixman_image_destroy_func_t)(pixman_image_t *image, void *= data); + +struct pixman_image { + int ref_count; + pixman_format_code_t format; + int width; + int height; + int stride; + uint8_t *data; + pixman_image_destroy_func_t destroy_func; + void *destroy_data; +}; + +typedef struct pixman_color { + uint16_t red; + uint16_t green; + uint16_t blue; + uint16_t alpha; +} pixman_color_t; + +static inline pixman_image_t *pixman_image_create_bits(pixman_format_code_= t format, + int width, + int height, + uint32_t *bits, + int rowstride_bytes) +{ + pixman_image_t *i =3D g_new0(pixman_image_t, 1); + + i->width =3D width; + i->height =3D height; + i->stride =3D rowstride_bytes ?: width * DIV_ROUND_UP(PIXMAN_FORMAT_BP= P(format), 8); + i->format =3D format; + i->data =3D bits ?: g_malloc0(rowstride_bytes * height); + i->ref_count =3D 1; + + return i; +} + +static inline pixman_image_t *pixman_image_ref(pixman_image_t *i) +{ + i->ref_count++; + return i; +} + +static inline bool pixman_image_unref(pixman_image_t *i) +{ + i->ref_count--; + + if (i->ref_count =3D=3D 0) { + if (i->destroy_func) { + i->destroy_func (i, i->destroy_data); + g_free(i->data); + g_free(i); + } + + return true; + } + + return false; +} + +static inline void pixman_image_set_destroy_function(pixman_image_t *i, + pixman_image_destroy_= func_t func, + void *data) + +{ + i->destroy_func =3D func; + i->destroy_data =3D data; +} + +static inline uint8_t* pixman_image_get_data(pixman_image_t *i) +{ + return i->data; +} + +static inline int pixman_image_get_height(pixman_image_t *i) +{ + return i->height; +} + +static inline int pixman_image_get_width(pixman_image_t *i) +{ + return i->width; +} + +static inline int pixman_image_get_stride(pixman_image_t *i) +{ + return i->stride; +} + +static inline pixman_format_code_t pixman_image_get_format(pixman_image_t = *i) +{ + return i->format; +} + +#endif /* PIXMAN_COMPAT_H */ diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h index 539c089f1d..9c693df8dd 100644 --- a/include/ui/qemu-pixman.h +++ b/include/ui/qemu-pixman.h @@ -12,6 +12,8 @@ #pragma GCC diagnostic ignored "-Wredundant-decls" #include #pragma GCC diagnostic pop +#else +#include "pixman-compat.h" #endif =20 /* --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695046881; cv=none; d=zohomail.com; s=zohoarc; b=iFea1xfbxAKYegI3M8Ti+VrZtC/IR675chDBT7wTh/tlSxStGotqAhwGTOwVfsZbEcggXRpoz8N7mdsv0fbXpIZq3vL1MoXYrEBuUFM7FAcoZtr+aD9MnSkEqLf18ef3tkYiPy8FtqY7+z57CJdk0p4NImbB6ud42HLSpqolfJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695046881; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JAAq6oURv7/Ab7LozQ4fDXV1z0sRozSZjYnJISsyitc=; b=dfxqw12JSKaWiXuc3646/RU/nRT73TE2+uZPFKgRdXhKFpJV0bE81wlmPXoLEe/pxSzZRTPas3XnyUcLlUxxbUszdqyo2BwfuPxeBadRfl77RO9EjrZVEAQnqFkOJICpaDZtuyqi+BZ8oIJrkHJtDjXgLWYJzjnjcJCdGKq+MoY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695046881529427.5799927676653; Mon, 18 Sep 2023 07:21:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgH-0005s4-HR; Mon, 18 Sep 2023 09:52:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgF-0005ol-6D for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEfv-0000Si-MA for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:49 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-13-x0cmA8F-PB6eOFysQE_Gwg-1; Mon, 18 Sep 2023 09:52:27 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 33F4D85A5BA; Mon, 18 Sep 2023 13:52:27 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 117F92156701; Mon, 18 Sep 2023 13:52:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JAAq6oURv7/Ab7LozQ4fDXV1z0sRozSZjYnJISsyitc=; b=IvnjjKs+7sVzq0qwdat3NpB6EI3iHUM/rXzcTrVhJ4gKd4aKIvk06O1UNrs368PIh7gRR7 2scPYCROFeDhwcyu3kuGpILTVLquF/iuvHHH+Myw3/t7JejivJA+zupOZeWp9K2RRQE/GA VfTa83md7fPbZ0u0JQtDfqcQmKGKU6I= X-MC-Unique: x0cmA8F-PB6eOFysQE_Gwg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Subject: [PATCH v2 04/18] ui/console: allow to override the default VC Date: Mon, 18 Sep 2023 17:51:51 +0400 Message-ID: <20230918135206.2739222-5-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695046883096100001 From: Marc-Andr=C3=A9 Lureau If a display is backed by a specialized VC, allow to override the default "vc:80Cx24C". For that, set the dpy.type just before creating the default serial/parallel/monitor. (the next patch makes it create a "null" backend by default if !PIXMAN) Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/ui/console.h | 2 ++ softmmu/vl.c | 45 +++++++++++++++++++++++--------------------- ui/console.c | 14 ++++++++++++++ 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index 28882f15a5..08c0f0dc70 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -463,12 +463,14 @@ struct QemuDisplay { DisplayType type; void (*early_init)(DisplayOptions *opts); void (*init)(DisplayState *ds, DisplayOptions *opts); + const char *vc; }; =20 void qemu_display_register(QemuDisplay *ui); bool qemu_display_find_default(DisplayOptions *opts); void qemu_display_early_init(DisplayOptions *opts); void qemu_display_init(DisplayState *ds, DisplayOptions *opts); +const char *qemu_display_get_vc(DisplayOptions *opts); void qemu_display_help(void); =20 /* vnc.c */ diff --git a/softmmu/vl.c b/softmmu/vl.c index 3db4fd2680..8850cd3121 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1361,6 +1361,23 @@ static void qemu_create_default_devices(void) } } =20 +#if defined(CONFIG_VNC) + if (!QTAILQ_EMPTY(&(qemu_find_opts("vnc")->head))) { + display_remote++; + } +#endif + if (dpy.type =3D=3D DISPLAY_TYPE_DEFAULT && !display_remote) { + if (!qemu_display_find_default(&dpy)) { + dpy.type =3D DISPLAY_TYPE_NONE; +#if defined(CONFIG_VNC) + vnc_parse("localhost:0,to=3D99,id=3Ddefault"); +#endif + } + } + if (dpy.type =3D=3D DISPLAY_TYPE_DEFAULT) { + dpy.type =3D DISPLAY_TYPE_NONE; + } + if (nographic) { if (default_parallel) add_device_config(DEV_PARALLEL, "null"); @@ -1373,12 +1390,15 @@ static void qemu_create_default_devices(void) monitor_parse("stdio", "readline", false); } } else { - if (default_serial) - add_device_config(DEV_SERIAL, "vc:80Cx24C"); + const char *vc =3D qemu_display_get_vc(&dpy); + + if (default_serial) { + add_device_config(DEV_SERIAL, vc); + } if (default_parallel) - add_device_config(DEV_PARALLEL, "vc:80Cx24C"); + add_device_config(DEV_PARALLEL, vc); if (default_monitor) - monitor_parse("vc:80Cx24C", "readline", false); + monitor_parse(vc, "readline", false); } =20 if (default_net) { @@ -1389,23 +1409,6 @@ static void qemu_create_default_devices(void) #endif } =20 -#if defined(CONFIG_VNC) - if (!QTAILQ_EMPTY(&(qemu_find_opts("vnc")->head))) { - display_remote++; - } -#endif - if (dpy.type =3D=3D DISPLAY_TYPE_DEFAULT && !display_remote) { - if (!qemu_display_find_default(&dpy)) { - dpy.type =3D DISPLAY_TYPE_NONE; -#if defined(CONFIG_VNC) - vnc_parse("localhost:0,to=3D99,id=3Ddefault"); -#endif - } - } - if (dpy.type =3D=3D DISPLAY_TYPE_DEFAULT) { - dpy.type =3D DISPLAY_TYPE_NONE; - } - /* If no default VGA is requested, the default is "none". */ if (default_vga) { vga_model =3D get_default_vga_model(machine_class); diff --git a/ui/console.c b/ui/console.c index 4a4f19ed33..a38d24f075 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1677,6 +1677,20 @@ void qemu_display_init(DisplayState *ds, DisplayOpti= ons *opts) dpys[opts->type]->init(ds, opts); } =20 +const char *qemu_display_get_vc(DisplayOptions *opts) +{ + assert(opts->type < DISPLAY_TYPE__MAX); + if (opts->type =3D=3D DISPLAY_TYPE_NONE) { + return NULL; + } + assert(dpys[opts->type] !=3D NULL); + if (dpys[opts->type]->vc) { + return dpys[opts->type]->vc; + } else { + return "vc:80Cx24C"; + } +} + void qemu_display_help(void) { int idx; --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695046370; cv=none; d=zohomail.com; s=zohoarc; b=O2einchH7HFFdgOn51d/tpRFnzy4IpyyUhD4ovyM8f/jmwiujJ5PI+QAIdtLqEOYBr/SFrgrYqWy73QTPezIAqT6ZWIm3C0va9vTyf42TDb+DKUJWdirnyaILSvv2KRHW7GRK01zkF03O3ctPv7NSnhX0oaRvtjPOnmzKfzhhG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695046370; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aupoXDcr9PltqvCNjaAh5m9URh/brIHjgnqNCBwtVIU=; b=mCDZVCe2ffhh65xexTd1C2nhMpYocq+4crDEWUWHnTV5Z6kRHs5tsNmGgJA1vBMs2cU7RQPH/9EBDwQxbeOoZ11to/RIC83LtLg0jU4Kmouul+UlWmACVq+83LDbfH4ytvLTrrJlxJLl1WJIs9h50oZ6ENrJ/ul2vhu9t/Y7320= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695046370844576.7642618621666; Mon, 18 Sep 2023 07:12:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgG-0005rH-Cc; Mon, 18 Sep 2023 09:52:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgF-0005ov-6N for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEg1-0000Tm-PY for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:50 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-418-lgwyym8IPqqr9h2oMsGrjg-1; Mon, 18 Sep 2023 09:52:31 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 516151C0514C; Mon, 18 Sep 2023 13:52:31 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40CAE492B16; Mon, 18 Sep 2023 13:52:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aupoXDcr9PltqvCNjaAh5m9URh/brIHjgnqNCBwtVIU=; b=feVQglc76T7gQmTCW8qvHtInRrBdCmTnfI4aVrFwf3wltwkqvtwDxaidf0HOeiMYf5fHbX 2SSBOgKI0L1EfeUmCfV4A5nlkTNvSKxB+PMlmEgy8gXNTC7STz3JOoxzHJZBXp2HVK0bvA grKdWP29Q2NpORROYuWz9glt6ZahbzE= X-MC-Unique: lgwyym8IPqqr9h2oMsGrjg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 05/18] ui/vc: console-vc requires PIXMAN Date: Mon, 18 Sep 2023 17:51:52 +0400 Message-ID: <20230918135206.2739222-6-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695046372444100003 From: Marc-Andr=C3=A9 Lureau Add stubs for the fallback paths. Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/console-vc-stubs.c | 32 ++++++++++++++++++++++++++++++++ ui/console.c | 4 ++++ ui/meson.build | 2 +- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 ui/console-vc-stubs.c diff --git a/ui/console-vc-stubs.c b/ui/console-vc-stubs.c new file mode 100644 index 0000000000..0827961b2b --- /dev/null +++ b/ui/console-vc-stubs.c @@ -0,0 +1,32 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + * QEMU VC stubs + */ +#include "qemu/osdep.h" + +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "qemu/option.h" +#include "chardev/char.h" +#include "ui/console-priv.h" + +void qemu_text_console_select(QemuTextConsole *c) +{ +} + +const char * qemu_text_console_get_label(QemuTextConsole *c) +{ + return NULL; +} + +void qemu_text_console_update_cursor(void) +{ +} + +void qemu_text_console_handle_keysym(QemuTextConsole *s, int keysym) +{ +} + +void qemu_console_early_init(void) +{ +} diff --git a/ui/console.c b/ui/console.c index a38d24f075..8b5c40ddd7 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1687,7 +1687,11 @@ const char *qemu_display_get_vc(DisplayOptions *opts) if (dpys[opts->type]->vc) { return dpys[opts->type]->vc; } else { +#ifdef CONFIG_PIXMAN return "vc:80Cx24C"; +#else + return "null"; +#endif } } =20 diff --git a/ui/meson.build b/ui/meson.build index 0a1e8272a3..3085e10a72 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -6,7 +6,6 @@ system_ss.add(png) system_ss.add(files( 'clipboard.c', 'console.c', - 'console-vc.c', 'cursor.c', 'input-keymap.c', 'input-legacy.c', @@ -19,6 +18,7 @@ system_ss.add(files( 'ui-qmp-cmds.c', 'util.c', )) +system_ss.add(when: pixman, if_true: files('console-vc.c'), if_false: file= s('console-vc-stubs.c')) if dbus_display system_ss.add(files('dbus-module.c')) endif --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695046658; cv=none; d=zohomail.com; s=zohoarc; b=nmR4xtJh9Gkr2xLY9zX6e6eGXrYzHvy3BVOr7HDf2zIItq0j/IuWUy0ilsq0vnPUDhnXs+iPmDvtZ0/vphB4R9IcPYRBn8Q5+UvCDYNEm+WXRkTOv091d0HuAwrCkZefCjE0amAWiYTI2w+uSdVYZBlXMi/fuZha+4KjYKLl0BM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695046658; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ry6SdqrOVkmVYyvI0gwYZEa0nPcUMgNO96UwKR3OkYY=; b=MD9Bh8s0C/qe/J/uEA67SgrqZvT1VmvPqtTZ/fsPcjsgOa+cUEDhAWGxLUVtmxop2cY9oqyW/EdSDJtu29vODCyDVoe8fdwVc8GtTw64fVF/y1qsqhWunfdn99mB7c2G5w0ek1eqy1afNch3RW2xU0N6RF7PiUbaW7puKAmJrR0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695046658694985.8841513568461; Mon, 18 Sep 2023 07:17:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgJ-0005t3-W9; Mon, 18 Sep 2023 09:52:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgH-0005s5-Pn for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEg4-0000Uc-RD for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:53 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-564-fucodKipPZmEZE9jWmKdfQ-1; Mon, 18 Sep 2023 09:52:36 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 62A5D3C025C3; Mon, 18 Sep 2023 13:52:36 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7114114027B9; Mon, 18 Sep 2023 13:52:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ry6SdqrOVkmVYyvI0gwYZEa0nPcUMgNO96UwKR3OkYY=; b=gtUaYJOaoqsnzrOM/EHSiJrzvBFN+gxB9KxtMyshBF8IXNSs4IVWALUUlV8IPxw9/njqfN NiKHZcgyhcjMxeJOSjEHMWKkCTpuYf6oMEacl0I2TtwEFvEKnFJcRYxeyjv+ugJRoNqgTq UxVzdFjbwEAzBEBDLhfTI478fDgmoCg= X-MC-Unique: fucodKipPZmEZE9jWmKdfQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Dr. David Alan Gilbert" , Eric Blake , Markus Armbruster Subject: [PATCH v2 06/18] qmp/hmp: disable screendump if PIXMAN is missing Date: Mon, 18 Sep 2023 17:51:53 +0400 Message-ID: <20230918135206.2739222-7-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695046659188100001 From: Marc-Andr=C3=A9 Lureau The command requires color conversion and line-by-line feeding. We could have a simple fallback for simple formats though. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- qapi/ui.json | 3 ++- ui/ui-hmp-cmds.c | 2 ++ ui/ui-qmp-cmds.c | 2 ++ hmp-commands.hx | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/qapi/ui.json b/qapi/ui.json index 006616aa77..e74cc3efb6 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -200,7 +200,8 @@ { 'command': 'screendump', 'data': {'filename': 'str', '*device': 'str', '*head': 'int', '*format': 'ImageFormat'}, - 'coroutine': true } + 'coroutine': true, + 'if': 'CONFIG_PIXMAN' } =20 ## # =3D=3D Spice diff --git a/ui/ui-hmp-cmds.c b/ui/ui-hmp-cmds.c index c671389473..26c8ced1f2 100644 --- a/ui/ui-hmp-cmds.c +++ b/ui/ui-hmp-cmds.c @@ -437,6 +437,7 @@ void sendkey_completion(ReadLineState *rs, int nb_args,= const char *str) } } =20 +#ifdef CONFIG_PIXMAN void coroutine_fn hmp_screendump(Monitor *mon, const QDict *qdict) { @@ -458,6 +459,7 @@ hmp_screendump(Monitor *mon, const QDict *qdict) end: hmp_handle_error(mon, err); } +#endif =20 void hmp_client_migrate_info(Monitor *mon, const QDict *qdict) { diff --git a/ui/ui-qmp-cmds.c b/ui/ui-qmp-cmds.c index debc07d678..d772e1cb7f 100644 --- a/ui/ui-qmp-cmds.c +++ b/ui/ui-qmp-cmds.c @@ -212,6 +212,7 @@ void qmp_client_migrate_info(const char *protocol, cons= t char *hostname, error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "'spice'"); } =20 +#ifdef CONFIG_PIXMAN #ifdef CONFIG_PNG /** * png_save: Take a screenshot as PNG @@ -391,3 +392,4 @@ qmp_screendump(const char *filename, const char *device, } } } +#endif /* CONFIG_PIXMAN */ diff --git a/hmp-commands.hx b/hmp-commands.hx index 2cbd0f77a0..bfb2e2d5e2 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -252,6 +252,7 @@ SRST =20 ERST =20 +#ifdef CONFIG_PIXMAN { .name =3D "screendump", .args_type =3D "filename:F,format:-fs,device:s?,head:i?", @@ -267,6 +268,7 @@ SRST ``screendump`` *filename* Save screen into PPM image *filename*. ERST +#endif =20 { .name =3D "logfile", --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695046587; cv=none; d=zohomail.com; s=zohoarc; b=cQhsjGqI/reQYkppHSzw0zY8e2qHRfe4rYYqu9gC9NLc8MIs8dlWjjSgtcMnxLvvPOfCglvvT1FZNm0MnreLRf5ggAuWnutvtegEKmVj97bJPdppaE2pEgaDGZeIIIf5VZ4uOgYCw3xYgNTsYBpEY27+kOF0Fs0IwWgKHTXCmJM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695046587; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=s5+e3JFYr7c0mztuM2EMhEesHcY+DdlysGfXNZqQu98=; b=Aw2Y7wsMHIgqJ5rsiQPbWaAG6loq6Q/YKb6egYspNkg1F1RlFpj05ypSxgVDB4F1a3W9ZHS9QjBqYh1sqQCmFV9n0Ow1cOrgXKz/9pO/zELkCeXWZJH3q7C83zthrm7qEGHgQLlA3SZYqscxdvz0SwKoyydp05BjYK76H8KU+k4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695046586951417.8554270497077; Mon, 18 Sep 2023 07:16:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgJ-0005t2-HL; Mon, 18 Sep 2023 09:52:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgI-0005sE-6w for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEg9-0000Vg-OR for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:53 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-479-dURTiOy1N7qzPrACJmz70w-1; Mon, 18 Sep 2023 09:52:41 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B283B29AA3BD; Mon, 18 Sep 2023 13:52:40 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 579CC140273C; Mon, 18 Sep 2023 13:52:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s5+e3JFYr7c0mztuM2EMhEesHcY+DdlysGfXNZqQu98=; b=gX28WLYOUBf/317CUJE+3nWfwJUljNQLY2jJXOk8TDB6AaSYSCj0BbqwrSSfvL98RRO49t DkLkBHotPWD3BCilZa9bprgjgi845n+T7A91SBVhubCpbqw+5wbfXiujw+irVfcBZwdxVT A4lm9GyIHCvufGUR1nQ/J+ZcLb+eNe8= X-MC-Unique: dURTiOy1N7qzPrACJmz70w-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" Subject: [PATCH v2 07/18] virtio-gpu: replace PIXMAN for region/rect test Date: Mon, 18 Sep 2023 17:51:54 +0400 Message-ID: <20230918135206.2739222-8-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695046587695100001 From: Marc-Andr=C3=A9 Lureau Use a simpler implementation for rectangle geometry & intersect, drop the need for (more complex) PIXMAN functions. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/ui/rect.h | 55 +++++++++++++++++++++++++++++++++++++++++ hw/display/virtio-gpu.c | 30 +++++++++------------- 2 files changed, 66 insertions(+), 19 deletions(-) create mode 100644 include/ui/rect.h diff --git a/include/ui/rect.h b/include/ui/rect.h new file mode 100644 index 0000000000..63edf7a39d --- /dev/null +++ b/include/ui/rect.h @@ -0,0 +1,55 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + */ +#ifndef QEMU_RECT_H +#define QEMU_RECT_H + +#include +#include + +typedef struct QemuRect { + int16_t x; + int16_t y; + uint16_t width; + uint16_t height; +} QemuRect; + +static inline void qemu_rect_init(QemuRect* rect, int16_t x, int16_t y, ui= nt16_t width, uint16_t height) +{ + rect->x =3D x; + rect->y =3D x; + rect->width =3D width; + rect->height =3D height; +} + +static inline void qemu_rect_translate(QemuRect* rect, int16_t dx, int16_t= dy) +{ + rect->x +=3D dx; + rect->y +=3D dy; +} + +static inline bool qemu_rect_intersect(const QemuRect* a, const QemuRect* = b, QemuRect *res) +{ + int16_t x1, x2, y1, y2; + + x1 =3D MAX(a->x, b->x); + y1 =3D MAX(a->y, b->y); + x2 =3D MIN(a->x + a->width, b->x + b->width); + y2 =3D MIN(a->y + a->height, b->y + b->height); + + if (x1 >=3D x2 || y1 >=3D y2) { + if (res) { + qemu_rect_init(res, 0, 0, 0, 0); + } + + return false; + } + + if (res) { + qemu_rect_init(res, x1, y1, x2 - x1, y2 - y1); + } + + return true; +} + +#endif diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 93857ad523..fdb7b25a70 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -16,6 +16,7 @@ #include "qemu/iov.h" #include "sysemu/cpus.h" #include "ui/console.h" +#include "ui/rect.h" #include "trace.h" #include "sysemu/dma.h" #include "sysemu/sysemu.h" @@ -507,7 +508,7 @@ static void virtio_gpu_resource_flush(VirtIOGPU *g, struct virtio_gpu_simple_resource *res; struct virtio_gpu_resource_flush rf; struct virtio_gpu_scanout *scanout; - pixman_region16_t flush_region; + QemuRect flush_rect; bool within_bounds =3D false; bool update_submitted =3D false; int i; @@ -569,34 +570,25 @@ static void virtio_gpu_resource_flush(VirtIOGPU *g, return; } =20 - pixman_region_init_rect(&flush_region, - rf.r.x, rf.r.y, rf.r.width, rf.r.height); + qemu_rect_init(&flush_rect, rf.r.x, rf.r.y, rf.r.width, rf.r.height); for (i =3D 0; i < g->parent_obj.conf.max_outputs; i++) { - pixman_region16_t region, finalregion; - pixman_box16_t *extents; + QemuRect rect; =20 if (!(res->scanout_bitmask & (1 << i))) { continue; } scanout =3D &g->parent_obj.scanout[i]; =20 - pixman_region_init(&finalregion); - pixman_region_init_rect(®ion, scanout->x, scanout->y, - scanout->width, scanout->height); + qemu_rect_init(&rect, scanout->x, scanout->y, + scanout->width, scanout->height); =20 - pixman_region_intersect(&finalregion, &flush_region, ®ion); - pixman_region_translate(&finalregion, -scanout->x, -scanout->y); - extents =3D pixman_region_extents(&finalregion); /* work out the area we need to update for each console */ - dpy_gfx_update(g->parent_obj.scanout[i].con, - extents->x1, extents->y1, - extents->x2 - extents->x1, - extents->y2 - extents->y1); - - pixman_region_fini(®ion); - pixman_region_fini(&finalregion); + if (qemu_rect_intersect(&flush_rect, &rect, &rect)) { + qemu_rect_translate(&rect, -scanout->x, -scanout->y); + dpy_gfx_update(g->parent_obj.scanout[i].con, + rect.x, rect.y, rect.width, rect.height); + } } - pixman_region_fini(&flush_region); } =20 static void virtio_unref_resource(pixman_image_t *image, void *data) --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695046581; cv=none; d=zohomail.com; s=zohoarc; b=kGVvmpMzbLq0zHmTGH7om7U2rTl+QlU7RxoDUapaGr7tu41llTYHXfZtknmqbP5Piqp/MrsuT0KWDAt8IB5EMXAZwwPXGuUbpLZBmC2zSaXWD4lyM4RkS7zVF07gld6pEObAAVooYmCeZijqlw6uOwzRwMs3c8aCYU+502PeMBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695046581; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=A+q6QDBDQVC7KF0pkCeHXvs6ccGc01ziz4FLxaV5JPE=; b=eakFtT1eUuQJU8NJhHus/rCaauw2E9b3YoHj2OuF8BPabo8ToDpVJ2YlLm3brU5XGbj8OWv0Tq03gLXGMYsM+XYhhUJ+eTwXShROQMWDTRbpqKh8d6qD5PBHdOHBLRm9/7cFK6VwLUgpMlje4Z3KdzID5iLFE10LvrwZ/OX6Ffs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695046581359646.2282228115831; Mon, 18 Sep 2023 07:16:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgJ-0005sb-2G; Mon, 18 Sep 2023 09:52:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgI-0005sN-CC for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgE-0000WP-Rr for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:54 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-691-LPqRqttcMvmHhdBE6bCcyA-1; Mon, 18 Sep 2023 09:52:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A3F871C05144; Mon, 18 Sep 2023 13:52:45 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C4AD170E4; Mon, 18 Sep 2023 13:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A+q6QDBDQVC7KF0pkCeHXvs6ccGc01ziz4FLxaV5JPE=; b=DYuzlcFzKQLR06oHAOZ3EreNW8crVAlnHR3IadNL1X5sW5aXtt6mwiuyreFIBC4YXqGqM1 4CjTJykJk8RGfGWKk57KTFbxiijC/oDvpPQOEWDMoWz+BrZ/9Rh0TBKhdwiW3ZQuN2EDqO zvgp2Kn8LCnQRGDgKBBltK7RTed4D4g= X-MC-Unique: LPqRqttcMvmHhdBE6bCcyA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 08/18] ui/console: when PIXMAN is unavailable, don't draw placeholder msg Date: Mon, 18 Sep 2023 17:51:55 +0400 Message-ID: <20230918135206.2739222-9-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695046581729100002 From: Marc-Andr=C3=A9 Lureau When we can't draw text, simply show a blank display. Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/console.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/console.c b/ui/console.c index 8b5c40ddd7..1c710a6d5e 100644 --- a/ui/console.c +++ b/ui/console.c @@ -584,6 +584,7 @@ DisplaySurface *qemu_create_placeholder_surface(int w, = int h, const char *msg) { DisplaySurface *surface =3D qemu_create_displaysurface(w, h); +#ifdef CONFIG_PIXMAN pixman_color_t bg =3D QEMU_PIXMAN_COLOR_BLACK; pixman_color_t fg =3D QEMU_PIXMAN_COLOR_GRAY; pixman_image_t *glyph; @@ -598,6 +599,7 @@ DisplaySurface *qemu_create_placeholder_surface(int w, = int h, x+i, y, FONT_WIDTH, FONT_HEIGHT); qemu_pixman_image_unref(glyph); } +#endif surface->flags |=3D QEMU_PLACEHOLDER_FLAG; return surface; } --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695047006; cv=none; d=zohomail.com; s=zohoarc; b=DnQdUKq1QgVlGFgHYTi48WwWb1E9KLiJIx1oRVA4+qH/tCxbCgs+g73hrRD95amZLwwSQbFvLQzFlWBvKt3gbVSG3nI19p4MRhuU60z+fuCblDrVzO33v7luoua+WlJMTUJpYRC4jAxNpYSZQ27oj+2eMnPHPCRebFuOkIBRkR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695047006; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kJiPpvjKWBAnBlGP3KkhDI2+e8BdQyJQjN7KhYL75jw=; b=AgmRb4AF3qA7yybeZgUGdKfmmmHZY/WBf3ga5O1NihIUAD5uY9+OmJ5IwD+vtPwF8N0ZPpkviX/3xJYO2AaHJdOcrAtALulJRxVNHBW9uyIky8baDXkKbkc+xarKJmtKM7EAa8lNpgqo6kaFreY6rf/dXUsLhcB1oOVB1ltUoSA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695047006141432.3520165174923; Mon, 18 Sep 2023 07:23:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgL-0005y3-4U; Mon, 18 Sep 2023 09:52:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgJ-0005sc-2D for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgH-0000Xc-5l for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:52:54 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-32-6EHmZ3GHPxWjnw9At-bbgQ-1; Mon, 18 Sep 2023 09:52:51 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D1D4A8039D1; Mon, 18 Sep 2023 13:52:50 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1DF9170E4; Mon, 18 Sep 2023 13:52:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kJiPpvjKWBAnBlGP3KkhDI2+e8BdQyJQjN7KhYL75jw=; b=IrCZoYFBXHA8UfRaRb1srLjFYlJIC80xplmb4f/skogSjppwIIJWyJQPWI6z/mD4sPeTKi x3xLWzGvOJLVlvIdZMJ0nP0Nox8w/1TdKdSUt7gDDILB+NThjMBykcEzhxdEwatJgkMuhF jRDcq0JJGQsvCEi6Ia0Q/GSX4vyFUYo= X-MC-Unique: 6EHmZ3GHPxWjnw9At-bbgQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" Subject: [PATCH v2 09/18] vhost-user-gpu: skip VHOST_USER_GPU_UPDATE when !PIXMAN Date: Mon, 18 Sep 2023 17:51:56 +0400 Message-ID: <20230918135206.2739222-10-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695047007048100003 From: Marc-Andr=C3=A9 Lureau This simply means that 2d drawing updates won't be handled, but 3d should work. Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/display/vhost-user-gpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 1150521d9d..709c8a02a1 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -307,6 +307,7 @@ vhost_user_gpu_handle_display(VhostUserGPU *g, VhostUse= rGpuMsg *msg) dpy_gl_update(con, m->x, m->y, m->width, m->height); break; } +#ifdef CONFIG_PIXMAN case VHOST_USER_GPU_UPDATE: { VhostUserGpuUpdate *m =3D &msg->payload.update; =20 @@ -334,6 +335,7 @@ vhost_user_gpu_handle_display(VhostUserGPU *g, VhostUse= rGpuMsg *msg) } break; } +#endif default: g_warning("unhandled message %d %d", msg->request, msg->size); } --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695045701; cv=none; d=zohomail.com; s=zohoarc; b=huweeoRtHCRnTqqir6OIkaQOCG6zMuKG7SDBcJP5AM/HMzo+/S2JeZOgIsNOWkHgh5jTrY/oIUdZVXn55ZwRQh9FJ5lu4fjQFMPlRgskkqJSfzr4martZkhStuy/uA0HhuCjFdBAAs0cZiUKO6H01gAf115JU2jS4lstXhPFGVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695045701; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4SZ/OasRCxgbsCQYI36rdtboQkh+0BPjMMpQl7MHELU=; b=S9mGaAQcb1LNELftNiXXGsjxHd7+ps5sD8vraGwiR6XnvoUjyJoE1GB7yuXW2+PgRdnLQP3J8JhEFZ+HOenupIeDVa0jBriQw4fjMjcjakZM0/vBELKBNbtaCW/3gTNlnclGXkUZvpziWXTcoLveDppCUVJEAoRII/HfQJCAbHk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695045701298237.1031149177295; Mon, 18 Sep 2023 07:01:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgR-00069q-Qy; Mon, 18 Sep 2023 09:53:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgP-00065Y-Jk for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgN-0000ZV-Ex for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:01 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-208-wlR5nG1EMjG9D6Ufjr8pEg-1; Mon, 18 Sep 2023 09:52:55 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 24E7129AA386; Mon, 18 Sep 2023 13:52:55 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1EB2E40C6EA8; Mon, 18 Sep 2023 13:52:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4SZ/OasRCxgbsCQYI36rdtboQkh+0BPjMMpQl7MHELU=; b=WaWEctu4i6UwjMiJ7ZrByLVuSynsl4+1jiKchO95ob1pRye1M999VLIs0ZnYIQZXYlxokV yB26fG3s1EetE+xvKKd3HVyvHFR6DZSO4vGzUg5DC0aP9kRFl8aOZAsvlIua+c3TQmF4td Tjx7GHS6SBZKEmkEaLI8r4RkWOgWgCA= X-MC-Unique: wlR5nG1EMjG9D6Ufjr8pEg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 10/18] ui/gl: opengl doesn't require PIXMAN Date: Mon, 18 Sep 2023 17:51:57 +0400 Message-ID: <20230918135206.2739222-11-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695045702898100003 From: Marc-Andr=C3=A9 Lureau The QEMU fallback covers the requirements. We still need the flags of header inclusion with CONFIG_PIXMAN. Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/meson.build b/ui/meson.build index 3085e10a72..7c99613950 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -60,8 +60,8 @@ endif system_ss.add(opengl) if opengl.found() opengl_ss =3D ss.source_set() - opengl_ss.add(gbm) - opengl_ss.add(when: [opengl, pixman], + opengl_ss.add(gbm, pixman) + opengl_ss.add(when: [opengl], if_true: files('shader.c', 'console-gl.c', 'egl-helpers.c',= 'egl-context.c')) ui_modules +=3D {'opengl' : opengl_ss} endif --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695047718; cv=none; d=zohomail.com; s=zohoarc; b=XrUJb0YS6e0WiyVm8M8sUu8LLJI9qG7vgoC2wlERIZlDUniauWg4vatM3s0zOgffUswdfOoJ5wwSpgCrmnhSkenpeQqoGGrD4JY/OY4QTZZswIC3zpY2uQsmZgB/me2Hz9iZ5GOdPJ0htDhFpG/locYw56Gipj0NUx1NBe1bKug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695047718; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=taaRBqG0XFWgKChFX1vM3MFQqlKC6r3BeCauD7hmblc=; b=loyJxHHUdT1vtSX8rWY/C63dkOaAGnbdUJuqSNk1tf0MM5iqVOrPWvRhgywN0AwXuUOp3Zm8B6P+Sr3GgKtUFGUTXxABSe0JXrZ4zXC2Fs4VOFrcm4azXBTcN/oMLVo3Unrb6TsBLu4cOoqxJCsXUDkvRs7ovBQ3cbGg8NeRKo0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695047718670936.6817870605869; Mon, 18 Sep 2023 07:35:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgV-0006BZ-P6; Mon, 18 Sep 2023 09:53:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgT-0006AD-Mp for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgR-0000aM-2v for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:05 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-462-EfaD4NxqMIibpv8wAUPO6g-1; Mon, 18 Sep 2023 09:52:59 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 12ACC29AA3BF; Mon, 18 Sep 2023 13:52:59 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55840170E4; Mon, 18 Sep 2023 13:52:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=taaRBqG0XFWgKChFX1vM3MFQqlKC6r3BeCauD7hmblc=; b=VturVu5WlhjKcyWBpw8YpYrwD2Zqd7O0ob3836Sz6/9KLmBhVQN8nfajo/TthhKTHzwIDa VXzBBBAweiS6kgdef6/HI2+mOH9189CSaAUmcEhFT/b3HmHotIZ4/EFp1ye91vqCmYkdEC 5Kc2puvSbQz+fq9v9waD5o4g8hVh97c= X-MC-Unique: EfaD4NxqMIibpv8wAUPO6g-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Subject: [PATCH v2 11/18] ui/vnc: VNC requires PIXMAN Date: Mon, 18 Sep 2023 17:51:58 +0400 Message-ID: <20230918135206.2739222-12-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695047719233100001 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- meson.build | 6 +++++- ui/meson.build | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index e870b039cc..8106ab39ac 100644 --- a/meson.build +++ b/meson.build @@ -1545,7 +1545,11 @@ endif vnc =3D not_found jpeg =3D not_found sasl =3D not_found -if get_option('vnc').allowed() and have_system +if get_option('vnc') \ + .disable_auto_if(not have_system) \ + .require(pixman.found(), + error_message: 'cannot enable VNC if pixman is not a= vailable') \ + .allowed() vnc =3D declare_dependency() # dummy dependency jpeg =3D dependency('libjpeg', required: get_option('vnc_jpeg'), method: 'pkg-config') diff --git a/ui/meson.build b/ui/meson.build index 7c99613950..b3525ef064 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -46,8 +46,8 @@ vnc_ss.add(files( )) vnc_ss.add(zlib, jpeg, gnutls) vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c')) -system_ss.add_all(when: vnc, if_true: vnc_ss) -system_ss.add(when: vnc, if_false: files('vnc-stubs.c')) +system_ss.add_all(when: [vnc, pixman], if_true: vnc_ss) +system_ss.add(when: [vnc, pixman], if_false: files('vnc-stubs.c')) =20 ui_modules =3D {} =20 --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695045771; cv=none; d=zohomail.com; s=zohoarc; b=gP4gb8659lYqZdjYC/ucSum61UYxpzy8MIk6t+kbFX7O07hyiiSw2ph6on3B6sU0tpUongXvpVJ20YgXfb/W4j61MPovM0K4iUa/S1kHNi39aIs+VLNNAEP+m6ZLRa0YRlAEbfipFaSCzD7L4ZE9fDfWTNii1DQyGoqXOeNbjGw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695045771; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aZtBHX8/YAwHC9VUa/hIWCMqA1tpFpHW5r5m/mQEUBw=; b=k5XYN4+B2CgrulD67mrtVwD9KdA/x/BiM5n4PoMwWZdWNLCxigfy3klqhAZMJ04W4niyXV7AxCRdcy70oX7ADWG/uqoliv/tMEU65JB6Az7GXrM5mGnJV0+TZ7H+qgmPprL24kGKB706mLNDOv7lnWdghYLiIeSi1YFBaJbh4O4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695045771890238.37381431677136; Mon, 18 Sep 2023 07:02:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgZ-0006FH-Uv; Mon, 18 Sep 2023 09:53:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgW-0006Bs-Vz for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgU-0000b7-LP for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:08 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-449-q2jh0Z6DMii5ZByZXFF--g-1; Mon, 18 Sep 2023 09:53:03 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3B55A1C05144; Mon, 18 Sep 2023 13:53:03 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B1632156702; Mon, 18 Sep 2023 13:53:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aZtBHX8/YAwHC9VUa/hIWCMqA1tpFpHW5r5m/mQEUBw=; b=VoKwjd1xW32BzMHI1KwWrTg2VB1W85bPJXgUWRQb8eyH1maOken48tCA9qkl3ZXVHm0HI6 0S3fzpjvi0eNS5txBEZ91OOsdftN5+PgWs7VLqBOSsYmSvucwd7+exxkBNCfD80SWq9JkZ SNgjM2VSsMq2NubYjcPoN4C4BqTsSVM= X-MC-Unique: q2jh0Z6DMii5ZByZXFF--g-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Subject: [PATCH v2 12/18] ui/spice: SPICE/QXL requires PIXMAN Date: Mon, 18 Sep 2023 17:51:59 +0400 Message-ID: <20230918135206.2739222-13-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695045774178100003 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- meson.build | 6 +++++- hw/display/Kconfig | 2 +- ui/meson.build | 10 +++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 8106ab39ac..1ef57ebda2 100644 --- a/meson.build +++ b/meson.build @@ -1030,7 +1030,11 @@ if not get_option('spice_protocol').auto() or have_s= ystem method: 'pkg-config') endif spice =3D not_found -if not get_option('spice').auto() or have_system +if get_option('spice') \ + .disable_auto_if(not have_system) \ + .require(pixman.found(), + error_message: 'cannot enable SPICE if pixman is not= available') \ + .allowed() spice =3D dependency('spice-server', version: '>=3D0.14.0', required: get_option('spice'), method: 'pkg-config') diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 7b3da68d1c..4d8b0cec40 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -93,7 +93,7 @@ config VGA =20 config QXL bool - depends on SPICE && PCI + depends on SPICE && PCI && PIXMAN select VGA =20 config VIRTIO_GPU diff --git a/ui/meson.build b/ui/meson.build index b3525ef064..7f806a6d48 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -141,12 +141,12 @@ if spice.found() 'spice-display.c' )) ui_modules +=3D {'spice-core' : spice_core_ss} -endif =20 -if spice.found() and gio.found() - spice_ss =3D ss.source_set() - spice_ss.add(spice, gio, pixman, files('spice-app.c')) - ui_modules +=3D {'spice-app': spice_ss} + if gio.found() + spice_ss =3D ss.source_set() + spice_ss.add(spice, gio, pixman, files('spice-app.c')) + ui_modules +=3D {'spice-app': spice_ss} + endif endif =20 keymaps =3D [ --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695050575; cv=none; d=zohomail.com; s=zohoarc; b=Ej8uInAJhbFE7Tw/wkSX8tclsRxVpKPE9zRTef3QN8G/yfkgATGJFnpbpg6T49Hq5b17RzJFYOVGIeehEXrjamg5MuifharZJExi1lPZ/yTCZKcDYp3VfwoN8PDaA0/kQHItNNnfBjc2Ks5cdh04Qhv0ULgjKTS2gxaVYMX34tI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695050575; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NsPollCvZmnvwydFF+8M2WXg80vwdnBOojfxdCu8rpg=; b=Pi08LnpehkRH3kBJw9e+GvRXrQ9bdIWEJaO+IDhLUuHW92FpJnnAc5JrlcNVBrj4+Pgj8dcIs7hp1AG12radss5oA79fdqcAGfu1K6moBFJ45/zJwX3ywPjoLVG5WQfa5Um7NTvZS3Ex5J2CP0pD7gkd3PS5MADDY3/VdvqsOXk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695050575263765.6700475906321; Mon, 18 Sep 2023 08:22:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgc-0006Hi-Ec; Mon, 18 Sep 2023 09:53:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgb-0006HD-1g for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgY-0000be-Jv for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:12 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-215-w_TXMicbOa6PJD7rQcJI4Q-1; Mon, 18 Sep 2023 09:53:07 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6F6D094592E; Mon, 18 Sep 2023 13:53:07 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58902170E4; Mon, 18 Sep 2023 13:53:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NsPollCvZmnvwydFF+8M2WXg80vwdnBOojfxdCu8rpg=; b=WdKreKfYxFJSB5ZXGJVbfIzNcXcNfkyamq2/1l90Xt75NFDvatZxb2MAFLcUr57B6zNJX3 8nBYp//li+o3mMBPJ0+OualCr+yowlZlCzM1YQEq9O9Pk/RwGNYo+9DKHx5LwKAjjnj6aI mpSbtiSzXmhsfpzee8Oc2pxpqDOsOFY= X-MC-Unique: w_TXMicbOa6PJD7rQcJI4Q-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Subject: [PATCH v2 13/18] ui/gtk: -display gtk requires PIXMAN Date: Mon, 18 Sep 2023 17:52:00 +0400 Message-ID: <20230918135206.2739222-14-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695050576438100001 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1ef57ebda2..74bdfa92b7 100644 --- a/meson.build +++ b/meson.build @@ -1516,7 +1516,11 @@ gtkx11 =3D not_found vte =3D not_found have_gtk_clipboard =3D get_option('gtk_clipboard').enabled() =20 -if not get_option('gtk').auto() or have_system +if get_option('gtk') \ + .disable_auto_if(not have_system) \ + .require(pixman.found(), + error_message: 'cannot enable GTK if pixman is not a= vailable') \ + .allowed() gtk =3D dependency('gtk+-3.0', version: '>=3D3.22.0', method: 'pkg-config', required: get_option('gtk')) --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695048932; cv=none; d=zohomail.com; s=zohoarc; b=bZj+iDyHEoGSufgTZV9fBcA6In3ZIBk5n/dYOhTHoeSjr5/oBjA6aa7lhPKx+OgWzfvwCGLCtt4NhHiGhxEe9YAJ+Wl/sIzVRj6IMhbFiBC2oeugKLrINF03sWOKWymgOCzo7gMCW10AxAYcJWTKUcEnxKrVXuRHxK5/GYtEqjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695048932; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EVh/lTEbi2AWqy/atGuCvQsgQoy4ieDQi9GMyB8JQuo=; b=G0j3zxa5e9U8rpxsUA+76DFlKCCW0gdR/p5MU1V4p1U76xp0txpvGBaZ8qJZi3FxfPJWlKcwopYCz8Fy0VW9iMfCcFOC1wHYlkcp3EPg1WtG3GMJiLAUjjLjaZmxGZh4waoX9IF7QBp9IKD08NArIjLZjJ4JxGRda9dszFq7nrE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695048932202525.6661750292945; Mon, 18 Sep 2023 07:55:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEgg-0006Kg-3w; Mon, 18 Sep 2023 09:53:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEge-0006IE-DI for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgc-0000ef-HQ for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:16 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-463-5livYbfSOx2Me6IcddplvQ-1; Mon, 18 Sep 2023 09:53:12 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EB07A101AA68; Mon, 18 Sep 2023 13:53:11 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3D352156701; Mon, 18 Sep 2023 13:53:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EVh/lTEbi2AWqy/atGuCvQsgQoy4ieDQi9GMyB8JQuo=; b=f5/TPreVtfGTFRFP75IDAZzBgX5uHA1pDCewrxlmhvklYO5fDOBidJjgwT97Q5V6z7H3PN x7DLzpfkR2OxE1m8YVzZNXAQebVYWK+XPM6zasuuKWAtKqFTGN1ZkGPwvSYedEEAH+IG0Y 9qPxrfHYhD0jujU4HQW00z3bOa5rNbY= X-MC-Unique: 5livYbfSOx2Me6IcddplvQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 14/18] ui/dbus: do not require PIXMAN Date: Mon, 18 Sep 2023 17:52:01 +0400 Message-ID: <20230918135206.2739222-15-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695048933283100001 From: Marc-Andr=C3=A9 Lureau Implement a fallback path for region 2D update. Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/dbus-listener.c | 88 ++++++++++++++++++++++++++++++++-------------- ui/meson.build | 2 +- 2 files changed, 62 insertions(+), 28 deletions(-) diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c index 36548a7f52..350988c70d 100644 --- a/ui/dbus-listener.c +++ b/ui/dbus-listener.c @@ -26,9 +26,6 @@ #include "qapi/error.h" #include "sysemu/sysemu.h" #include "dbus.h" -#ifdef CONFIG_OPENGL -#include -#endif #ifdef G_OS_UNIX #include #endif @@ -41,6 +38,7 @@ #include "ui/shader.h" #include "ui/egl-helpers.h" #include "ui/egl-context.h" +#include "ui/qemu-pixman.h" #endif #include "trace.h" =20 @@ -62,9 +60,11 @@ struct _DBusDisplayListener { =20 QemuDBusDisplay1Listener *proxy; =20 -#ifdef CONFIG_OPENGL +#ifdef CONFIG_PIXMAN /* Keep track of the damage region */ pixman_region32_t gl_damage; +#else + int gl_damage; #endif =20 DisplayChangeListener dcl; @@ -545,6 +545,7 @@ static void dbus_gl_refresh(DisplayChangeListener *dcl) return; } =20 +#ifdef CONFIG_PIXMAN int n_rects =3D pixman_region32_n_rects(&ddl->gl_damage); =20 for (int i =3D 0; i < n_rects; i++) { @@ -555,6 +556,13 @@ static void dbus_gl_refresh(DisplayChangeListener *dcl) box->x2 - box->x1, box->y2 - box->y1); } pixman_region32_clear(&ddl->gl_damage); +#else + if (ddl->gl_damage) { + dbus_call_update_gl(dcl, 0, 0, + surface_width(ddl->ds), surface_height(ddl->ds= )); + ddl->gl_damage =3D 0; + } +#endif } #endif /* OPENGL */ =20 @@ -569,20 +577,62 @@ static void dbus_gl_gfx_update(DisplayChangeListener = *dcl, { DBusDisplayListener *ddl =3D container_of(dcl, DBusDisplayListener, dc= l); =20 +#ifdef CONFIG_PIXMAN pixman_region32_t rect_region; pixman_region32_init_rect(&rect_region, x, y, w, h); pixman_region32_union(&ddl->gl_damage, &ddl->gl_damage, &rect_region); pixman_region32_fini(&rect_region); +#else + ddl->gl_damage++; +#endif } #endif =20 +static void dbus_gfx_update_sub(DBusDisplayListener *ddl, + int x, int y, int w, int h) +{ + pixman_image_t *img; + size_t stride; + GVariant *v_data; + + /* make a copy, since gvariant only handles linear data */ + stride =3D w * DIV_ROUND_UP(PIXMAN_FORMAT_BPP(surface_format(ddl->ds))= , 8); + img =3D pixman_image_create_bits(surface_format(ddl->ds), + w, h, NULL, stride); +#ifdef CONFIG_PIXMAN + pixman_image_composite(PIXMAN_OP_SRC, ddl->ds->image, NULL, img, + x, y, 0, 0, 0, 0, w, h); +#else + { + uint8_t *src =3D pixman_image_get_data(ddl->ds->image); + uint8_t *dst =3D pixman_image_get_data(img); + int bp =3D PIXMAN_FORMAT_BPP(surface_format(ddl->ds)) / 8; + int hh; + + for (hh =3D 0; hh < h; hh++) { + memcpy(&dst[stride * hh], &src[surface_stride(ddl->ds) * (hh += y) + x * bp], stride); + } + } +#endif + v_data =3D g_variant_new_from_data( + G_VARIANT_TYPE("ay"), + pixman_image_get_data(img), + pixman_image_get_stride(img) * h, + TRUE, + (GDestroyNotify)pixman_image_unref, + img); + qemu_dbus_display1_listener_call_update(ddl->proxy, + x, y, w, h, pixman_image_get_stride(img), pixman_image_get_format(= img), + v_data, + G_DBUS_CALL_FLAGS_NONE, + DBUS_DEFAULT_TIMEOUT, NULL, NULL, NULL); +} + static void dbus_gfx_update(DisplayChangeListener *dcl, int x, int y, int w, int h) { DBusDisplayListener *ddl =3D container_of(dcl, DBusDisplayListener, dc= l); - pixman_image_t *img; GVariant *v_data; - size_t stride; =20 assert(ddl->ds); =20 @@ -619,25 +669,7 @@ static void dbus_gfx_update(DisplayChangeListener *dcl, return; } =20 - /* make a copy, since gvariant only handles linear data */ - stride =3D w * DIV_ROUND_UP(PIXMAN_FORMAT_BPP(surface_format(ddl->ds))= , 8); - img =3D pixman_image_create_bits(surface_format(ddl->ds), - w, h, NULL, stride); - pixman_image_composite(PIXMAN_OP_SRC, ddl->ds->image, NULL, img, - x, y, 0, 0, 0, 0, w, h); - - v_data =3D g_variant_new_from_data( - G_VARIANT_TYPE("ay"), - pixman_image_get_data(img), - pixman_image_get_stride(img) * h, - TRUE, - (GDestroyNotify)pixman_image_unref, - img); - qemu_dbus_display1_listener_call_update(ddl->proxy, - x, y, w, h, pixman_image_get_stride(img), pixman_image_get_format(= img), - v_data, - G_DBUS_CALL_FLAGS_NONE, - DBUS_DEFAULT_TIMEOUT, NULL, NULL, NULL); + dbus_gfx_update_sub(ddl, x, y, w, h); } =20 #ifdef CONFIG_OPENGL @@ -751,8 +783,10 @@ dbus_display_listener_dispose(GObject *object) g_clear_object(&ddl->map_proxy); g_clear_object(&ddl->d3d11_proxy); g_clear_pointer(&ddl->peer_process, CloseHandle); -#ifdef CONFIG_OPENGL +#ifdef CONFIG_PIXMAN pixman_region32_fini(&ddl->gl_damage); +#endif +#ifdef CONFIG_OPENGL egl_fb_destroy(&ddl->fb); #endif #endif @@ -787,7 +821,7 @@ dbus_display_listener_class_init(DBusDisplayListenerCla= ss *klass) static void dbus_display_listener_init(DBusDisplayListener *ddl) { -#ifdef CONFIG_OPENGL +#ifdef CONFIG_PIXMAN pixman_region32_init(&ddl->gl_damage); #endif } diff --git a/ui/meson.build b/ui/meson.build index 7f806a6d48..521843c356 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -93,7 +93,7 @@ if dbus_display '--generate-c-code', '@BASENAME@= ']) dbus_display1_lib =3D static_library('dbus-display1', dbus_display1, dep= endencies: gio) dbus_display1_dep =3D declare_dependency(link_with: dbus_display1_lib, i= nclude_directories: include_directories('.')) - dbus_ss.add(when: [gio, pixman, dbus_display1_dep], + dbus_ss.add(when: [gio, dbus_display1_dep], if_true: [files( 'dbus-chardev.c', 'dbus-clipboard.c', --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695048409; cv=none; d=zohomail.com; s=zohoarc; b=QtXfinUKEMhH74gME1vE22yRWyOQGD/2dfP2iNtrhyB8jXBfo/yoKtJccII15JyVIHG4C01tFHah5hZItCaw4mklJ1wXPqfeuKTGE4v75q1zkeZSwY1k/M3E6ARP1eEp/Rhnli5juSMoOcPqxcnIzQZ/n+TF7Ljjz6SvOfJONxE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695048409; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hqA84g3Q6bwesCoYv84+27Pj9t+dAThTuHxGb8k+LrE=; b=YcIn9jWDe1ytqA2osQWErnHIHroxNKx0nS8+r83OWKuoqwj8Z2hvBKUTPgPyKeCdYrsk6iYTyaj9Lo2tNzNZA0FL9tGdy56HWmc9SauO9BSEEewG7Nh92SB+gk9zJ23ldAHtExIhB5RvhW+s2ZoSUi1dl3FV1TJiDGdWGDuX/Gs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695048409972920.873527905821; Mon, 18 Sep 2023 07:46:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEhW-00076G-Ig; Mon, 18 Sep 2023 09:54:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEh1-0006OH-4O for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgh-0000hD-DJ for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:38 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-189-co3bmy3JMM2IGM_o7m86sQ-1; Mon, 18 Sep 2023 09:53:16 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D9A6E945923; Mon, 18 Sep 2023 13:53:15 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id C059C10EE859; Mon, 18 Sep 2023 13:53:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hqA84g3Q6bwesCoYv84+27Pj9t+dAThTuHxGb8k+LrE=; b=g8B0ezKbBUdLQ5CKffg7HGi42BhEYEm4DvbHfTaQR1ST6qt/5Rgao3nfygJufFRXfOpKri t5RPp82K6AyWBB8Othcjfs+2eVmj/P3TW3UOGItnD3Jkha0qRieGTYh6+XsiWCEYuZ3UaL cVdaVWpFQ74lM4PBC2rWHpbAUHKKRRI= X-MC-Unique: co3bmy3JMM2IGM_o7m86sQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PATCH v2 15/18] arm/kconfig: XLNX_ZYNQMP_ARM depends on PIXMAN Date: Mon, 18 Sep 2023 17:52:02 +0400 Message-ID: <20230918135206.2739222-16-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695048412636100001 From: Marc-Andr=C3=A9 Lureau The Display Port has some strong PIXMAN dependency. Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/arm/Kconfig | 3 ++- hw/display/Kconfig | 5 +++++ hw/display/meson.build | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 7e68348440..57178bc299 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -451,7 +451,7 @@ config STM32F405_SOC config XLNX_ZYNQMP_ARM bool default y - depends on TCG && AARCH64 + depends on TCG && AARCH64 && PIXMAN select AHCI select ARM_GIC select CADENCE @@ -463,6 +463,7 @@ config XLNX_ZYNQMP_ARM select XILINX_AXI select XILINX_SPIPS select XLNX_CSU_DMA + select XLNX_DISPLAYPORT select XLNX_ZYNQMP select XLNX_ZDMA select USB_DWC3 diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 4d8b0cec40..1aafe1923d 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -134,3 +134,8 @@ config MACFB bool select FRAMEBUFFER depends on NUBUS + +config XLNX_DISPLAYPORT + bool + # defaults to "N", enabled by specific boards + depends on PIXMAN diff --git a/hw/display/meson.build b/hw/display/meson.build index 413ba4ab24..a7166b29d5 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -57,7 +57,7 @@ if config_all_devices.has_key('CONFIG_QXL') endif =20 system_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c')) -system_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c')) +system_ss.add(when: 'CONFIG_XLNX_DISPLAYPORT', if_true: files('xlnx_dp.c')) =20 system_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c')) =20 --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695047391; cv=none; d=zohomail.com; s=zohoarc; b=aArLL1Na7G6RUSoTWUTnRu0iTB8N9CZWsFnuwQaJGbwED7C+LUObEN4epSRZ82rd0jReIx32t6WbzZk31l8a9/SGA8GSn5/XSR94u1qSLKA1NSR10eOT97rmO1TYET2TO65xSylaO5MUSXJ2RXKxnJ6S97TKBBpZJK96bMn+60Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695047391; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D6SI9rwd/TNwOZbdFKCphFrmp83f8MLrzIddIHTVG+Q=; b=gIrOgAHtsepFALia076riDuuJcxrp6ZJWZ635MVoe5E/A9IuvsoiFBMHziXcReXEeLny3pxtEEp0u65wd4INvnGvQPWSW1oPZjROYDgMLBWlbPFyQXLLnqVwDHYIFd9lS0RicmG2M9GPlIjXPmce+bdEfIM4fCVyOPqtw+nhNIg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695047391578772.3114527249962; Mon, 18 Sep 2023 07:29:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEhB-0006To-3e; Mon, 18 Sep 2023 09:53:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgz-0006Nh-Kz for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgv-0000ht-St for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:37 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-656-s_gdSr4RMkWcxUKMs98kqg-1; Mon, 18 Sep 2023 09:53:21 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C52E945922; Mon, 18 Sep 2023 13:53:21 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id C9F3540C2064; Mon, 18 Sep 2023 13:53:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D6SI9rwd/TNwOZbdFKCphFrmp83f8MLrzIddIHTVG+Q=; b=dYh0IuE3AD1idOiJOBTiO5bB0TvKWvNlg7UZouOYvF48w3fAO4eJln8+2KC9wngMeOn1by SM4rdxDjE73buPxHy8z0WqIXEc2++TlkQSMB8i9ezsJZQmBzKgB5nI/0JiGlarHdiFA+0/ watTUEKOFb5pylcldyqOXl+cBfCi8NE= X-MC-Unique: s_gdSr4RMkWcxUKMs98kqg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , BALATON Zoltan , qemu-ppc@nongnu.org (open list:sam460ex) Subject: [PATCH v2 16/18] hw/sm501: allow compiling without PIXMAN Date: Mon, 18 Sep 2023 17:52:03 +0400 Message-ID: <20230918135206.2739222-17-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695047392648100005 From: Marc-Andr=C3=A9 Lureau Drop the "x-pixman" property and use fallback path in such case. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: BALATON Zoltan --- hw/display/sm501.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 0eecd00701..a897c82f04 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -730,7 +730,6 @@ static void sm501_2d_operation(SM501State *s) switch (cmd) { case 0: /* BitBlt */ { - static uint32_t tmp_buf[16384]; unsigned int src_x =3D (s->twoD_source >> 16) & 0x01FFF; unsigned int src_y =3D s->twoD_source & 0xFFFF; uint32_t src_base =3D s->twoD_source_base & 0x03FFFFFF; @@ -828,9 +827,11 @@ static void sm501_2d_operation(SM501State *s) de =3D db + (width + (height - 1) * dst_pitch) * bypp; overlap =3D (db < se && sb < de); } +#ifdef CONFIG_PIXMAN if (overlap && (s->use_pixman & BIT(2))) { /* pixman can't do reverse blit: copy via temporary */ int tmp_stride =3D DIV_ROUND_UP(width * bypp, sizeof(uint3= 2_t)); + static uint32_t tmp_buf[16384]; uint32_t *tmp =3D tmp_buf; =20 if (tmp_stride * sizeof(uint32_t) * height > sizeof(tmp_bu= f)) { @@ -860,9 +861,12 @@ static void sm501_2d_operation(SM501State *s) dst_pitch * bypp / sizeof(uint32_t), 8 * bypp, 8 * bypp, src_x, src_y, dst_x, dst_y, width, height); - } else { + } else +#else + { fallback =3D true; } +#endif if (fallback) { uint8_t *sp =3D s->local_mem + src_base; uint8_t *d =3D s->local_mem + dst_base; @@ -894,10 +898,13 @@ static void sm501_2d_operation(SM501State *s) color =3D cpu_to_le16(color); } =20 +#ifdef CONFIG_PIXMAN if (!(s->use_pixman & BIT(0)) || (width =3D=3D 1 && height =3D=3D = 1) || !pixman_fill((uint32_t *)&s->local_mem[dst_base], dst_pitch * bypp / sizeof(uint32_t), 8 * bypp, - dst_x, dst_y, width, height, color)) { + dst_x, dst_y, width, height, color)) +#endif + { /* fallback when pixman failed or we don't want to call it */ uint8_t *d =3D s->local_mem + dst_base; unsigned int x, y, i; @@ -2038,7 +2045,9 @@ static void sm501_realize_sysbus(DeviceState *dev, Er= ror **errp) =20 static Property sm501_sysbus_properties[] =3D { DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0), +#ifdef CONFIG_PIXMAN DEFINE_PROP_UINT8("x-pixman", SM501SysBusState, state.use_pixman, 7), +#endif DEFINE_PROP_END_OF_LIST(), }; =20 @@ -2126,7 +2135,9 @@ static void sm501_realize_pci(PCIDevice *dev, Error *= *errp) =20 static Property sm501_pci_properties[] =3D { DEFINE_PROP_UINT32("vram-size", SM501PCIState, vram_size, 64 * MiB), +#ifdef CONFIG_PIXMAN DEFINE_PROP_UINT8("x-pixman", SM501PCIState, state.use_pixman, 7), +#endif DEFINE_PROP_END_OF_LIST(), }; =20 @@ -2169,8 +2180,10 @@ static void sm501_pci_class_init(ObjectClass *klass,= void *data) =20 static void sm501_pci_init(Object *o) { +#ifdef CONFIG_PIXMAN object_property_set_description(o, "x-pixman", "Use pixman for: " "1: fill, 2: blit, 4: overlap blit"); +#endif } =20 static const TypeInfo sm501_pci_info =3D { --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695047393; cv=none; d=zohomail.com; s=zohoarc; b=YZZVf9aR7fFYVrG06EH9b9EKvOsMGbQIhoqzVFkklAl1sZo21EghH859kNQ5OyDCpNE1fmfW9BcKtbkfb0lCyG3hJO+kTqHFNJEdAem3M/H3iZxsfkwhuFNZcHumaTmir/ArMv/77CNmKDsq5JZwdmkiFiqNzCOk4FcRfxBFkZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695047393; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DAg+aBnQFOvR9IHc1iUw9PI5FSPew9yy7VkMrRS4uis=; b=iaygBsnd+5lwQOEl5gk6+JRA8OYGG8ONop/Mc93Tn2Ae3aQylUc0SSlT9I/9NEf4qtLm5oSxv4WLCmA/IFsq6cVRx/3BlYck2GoGMUST+6FFHkgt64usK30/mMG6M43T+RzVycwQchto9DT1hvjEtvccRLtPcndzLgSHqLMKOHM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695047393736138.25320171249632; Mon, 18 Sep 2023 07:29:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEhB-0006rQ-8p; Mon, 18 Sep 2023 09:53:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgz-0006Ni-MY for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgv-0000ky-Se for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:37 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-397-9Oaj4wQvNKOPClRgRH_gyw-1; Mon, 18 Sep 2023 09:53:25 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6D9A6811E7D; Mon, 18 Sep 2023 13:53:25 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A2481005B8E; Mon, 18 Sep 2023 13:53:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DAg+aBnQFOvR9IHc1iUw9PI5FSPew9yy7VkMrRS4uis=; b=fD4dFMwk+5fSHihZVVqNDC/Au8bpygTSLqLoRcONan7ZS/BvPhQ/RWqE2SlD/6YihJveRj ZOEej3dnLrnRaAAb/PGZhqNs9LRZiDlYXrL+ewIy/AwGTRiVocYv+RA1WBaGbUMhSjuDrq wWTR74VgAqtoxobKqwxRdpK0iDKoQWU= X-MC-Unique: 9Oaj4wQvNKOPClRgRH_gyw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Subject: [PATCH v2 17/18] hw/display: make ATI_VGA depend on PIXMAN Date: Mon, 18 Sep 2023 17:52:04 +0400 Message-ID: <20230918135206.2739222-18-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695047394637100011 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- configs/devices/mips64el-softmmu/default.mak | 2 +- hw/display/Kconfig | 2 +- hw/display/meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/devices/mips64el-softmmu/default.mak b/configs/devices= /mips64el-softmmu/default.mak index d5188f7ea5..8d85607571 100644 --- a/configs/devices/mips64el-softmmu/default.mak +++ b/configs/devices/mips64el-softmmu/default.mak @@ -3,7 +3,7 @@ include ../mips-softmmu/common.mak CONFIG_FULOONG=3Dy CONFIG_LOONGSON3V=3Dy -CONFIG_ATI_VGA=3Dy +# CONFIG_ATI_VGA=3Dn CONFIG_RTL8139_PCI=3Dy CONFIG_JAZZ=3Dy CONFIG_VT82C686=3Dy diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 1aafe1923d..4d8a6c4af8 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -125,7 +125,7 @@ config DPCD config ATI_VGA bool default y if PCI_DEVICES - depends on PCI + depends on PCI && PIXMAN select VGA select BITBANG_I2C select DDC diff --git a/hw/display/meson.build b/hw/display/meson.build index a7166b29d5..3aabf10226 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -61,7 +61,7 @@ system_ss.add(when: 'CONFIG_XLNX_DISPLAYPORT', if_true: f= iles('xlnx_dp.c')) =20 system_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c')) =20 -system_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'a= ti_2d.c', 'ati_dbg.c')) +system_ss.add(when: 'CONFIG_ATI_VGA', if_true: [files('ati.c', 'ati_2d.c',= 'ati_dbg.c'), pixman]) =20 =20 if config_all_devices.has_key('CONFIG_VIRTIO_GPU') --=20 2.41.0 From nobody Thu May 16 03:23:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695045708; cv=none; d=zohomail.com; s=zohoarc; b=TvZFWjTujPwvc/kAfb4qMIUQJ3ZJeoDgDyHg6AsLVTC3NDzrlVFQyztOYxa2AyZd6lzczBpDuqu+q8mUtmsXiPIj/8noGhTQrzhSbjk82Lj1PjD65t0EIgnjuVk8rrtkuKgF3zZu4J3BMCXLou4OTDqWDeOPv3bBXP8fz44Qt2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695045708; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vsV8tRlrKQcFcHN+g09cd19/3XXUr06VDoIl/BLeKLk=; b=AfhQqg4CfaonlRnt9XJoEJLEFcf9uVOtz9U765xneyJteGpnbz6CUqIhlgxoY1wHAo43dvBpt5XgjTWOUvVL4qiNf6CEkIHxh6p/O0bEOurmMx3VwxP+ZNkPHOwpRAj9ILzgo3ysUCpcBKVolsJdVJWxYse8QwwOBlCMoGdFK80= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695045708473354.13150340427217; Mon, 18 Sep 2023 07:01:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiEhb-0007Cf-IZ; Mon, 18 Sep 2023 09:54:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEh1-0006OI-4R for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiEgx-0000nB-9d for qemu-devel@nongnu.org; Mon, 18 Sep 2023 09:53:38 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-554-isae9seBOAuz14ztMe42VQ-1; Mon, 18 Sep 2023 09:53:29 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6FECC29AA3BF; Mon, 18 Sep 2023 13:53:29 +0000 (UTC) Received: from localhost (unknown [10.39.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6460B40C2064; Mon, 18 Sep 2023 13:53:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695045212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vsV8tRlrKQcFcHN+g09cd19/3XXUr06VDoIl/BLeKLk=; b=VCGPc61H5rGBA1DBbj7Opd6kVIFoxhk8acYFjl2mya9MQwdSlnB74+5Sb4P61ljRpQNXUi s4GBwZ8Phn3DEvatJLpbpPOaQcwMH/qnpgt8XYqXPq58m0LY4I5kXi8dJSdn97dHVDcboL koplG9RjBJR32h7NeFPAvYGe9AGRLOg= X-MC-Unique: isae9seBOAuz14ztMe42VQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Subject: [PATCH v2 18/18] build-sys: make pixman actually optional Date: Mon, 18 Sep 2023 17:52:05 +0400 Message-ID: <20230918135206.2739222-19-marcandre.lureau@redhat.com> In-Reply-To: <20230918135206.2739222-1-marcandre.lureau@redhat.com> References: <20230918135206.2739222-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695045710861100003 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- meson.build | 3 --- 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build index 74bdfa92b7..bcf7424440 100644 --- a/meson.build +++ b/meson.build @@ -832,9 +832,6 @@ if not get_option('pixman').auto() or have_system or ha= ve_tools pixman =3D dependency('pixman-1', required: get_option('pixman'), versio= n:'>=3D0.21.8', method: 'pkg-config') endif -if not pixman.found() - error('FIXME: pixman is currently required') -endif =20 zlib =3D dependency('zlib', required: true) =20 --=20 2.41.0