From patchwork Tue Nov 7 07:18:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1860692 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FD/4LX2I; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPfkN25Qyz1yQL for ; Tue, 7 Nov 2023 18:20:12 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0GN1-0007dP-JG; Tue, 07 Nov 2023 02:19:31 -0500 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 1r0GN0-0007cj-5x for qemu-ppc@nongnu.org; Tue, 07 Nov 2023 02:19:30 -0500 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 1r0GMu-0002dt-2u for qemu-ppc@nongnu.org; Tue, 07 Nov 2023 02:19:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699341563; 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; bh=FZ9c51qIhtfDpwm5jCLfsVDeIXdSFsIsbXJIglZo1R4=; b=FD/4LX2IvD/ejrwcCXvbAo2tEtWToHkq3b0Io1DCqk48BwLy4nyp8upL6pOj3iYNBGbs63 Xlck5DtMrCJxUYTYvf4EPRdsq9enWwisCNRgReUba9J3KaLU+D9S7IYWAVhVB5Z9dc+Sbp Ewf6bzrQXhzBrNu2YJOfguPa2OQ1ZJE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-360-KLGi9iqIMt2q8_gRYl1I5g-1; Tue, 07 Nov 2023 02:19:20 -0500 X-MC-Unique: KLGi9iqIMt2q8_gRYl1I5g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 18A37101A53B; Tue, 7 Nov 2023 07:19:20 +0000 (UTC) Received: from localhost (unknown [10.39.208.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84AE240C6EB9; Tue, 7 Nov 2023 07:19:17 +0000 (UTC) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: BALATON Zoltan , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , stefanha@gmail.com, Gerd Hoffmann , qemu-ppc@nongnu.org, =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= Subject: [PATCH v8 00/24] Make Pixman an optional dependency Date: Tue, 7 Nov 2023 11:18:50 +0400 Message-ID: <20231107071915.2459115-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-ppc@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-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-ppc-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau Hi, QEMU system emulators can be made to compile and work without Pixman. Only a few devices and options actually require it (VNC, Gtk, Spice for ex) and will have to be compiled out. However, most of QEMU graphics-related code is based on pixman_image_t and format. If we want to provide mostly compatible QEMU machines with or without Pixman, all we need to do is to have a small compatibility header with just the bare minimum for those types (see "ui: add pixman-compat.h"). There are a limited number of operations related to geometry that are slightly better implemented in QEMU (without Pixman, see "virtio-gpu: replace PIXMAN for region/rect test"). Without this simple compatibility header approach, QEMU at runtime becomes a very different emulator (without graphics device/board, display etc) and full of "if PIXMAN" conditions in the code. This is a much worse outcome imho, compared to this small header maintainance and compatibility story. Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1172 v8: - rebased - replace "hw/display: make ATI_VGA depend on PIXMAN" with "hw/display/ati: allow compiling without PIXMAN" - add some r-b v7: - make FULOONG depend on VT82C686 - various r-b/a-b v6: - add "build-sys: drop needless warning pragmas for old pixman" - rename pixman-compat.h -> pixman-minimal.h - add "vl: drop needless -spice checks" - add "qemu-options: define -vnc only #ifdef CONFIG_VNC" - add "vl: simplify display_remote logic" - in "vl: move display early init before default devices", rename the introduced function qemu_setup_display() - adapt "hw/sm501: allow compiling without PIXMAN" following Zoltan review, using warn_report(), droping Error argument - various r-b/a-b v5: - fixed "vl: move display early init before default devices" patch v4: - added "vl: move display early init before default devices" patch - code style fixes - a-b from Zoltan v3: - improve transient meson condition in first patch (Paolo) - use muxed console as fallback by default (Paolo) - make pixman-compat.h closer to original API - keep "x-pixman" property for sm501 (Zoltan) Marc-André Lureau (24): build-sys: add a "pixman" feature build-sys: drop needless warning pragmas for old pixman ui: compile out some qemu-pixman functions when !PIXMAN ui: add pixman-minimal.h vl: drop needless -spice checks qemu-options: define -vnc only #ifdef CONFIG_VNC vl: simplify display_remote logic vl: move display early init before default devices ui/console: allow to override the default VC ui/vc: console-vc requires PIXMAN qmp/hmp: disable screendump if PIXMAN is missing virtio-gpu: replace PIXMAN for region/rect test ui/console: when PIXMAN is unavailable, don't draw placeholder msg vhost-user-gpu: skip VHOST_USER_GPU_UPDATE when !PIXMAN ui/gl: opengl doesn't require PIXMAN ui/vnc: VNC requires PIXMAN ui/spice: SPICE/QXL requires PIXMAN ui/gtk: -display gtk requires PIXMAN ui/dbus: do not require PIXMAN arm/kconfig: XLNX_ZYNQMP_ARM depends on PIXMAN hw/sm501: allow compiling without PIXMAN hw/mips: FULOONG depends on VT82C686 hw/display/ati: allow compiling without PIXMAN build-sys: make pixman actually optional meson.build | 25 ++++- qapi/ui.json | 3 +- include/ui/console.h | 2 + include/ui/pixman-minimal.h | 195 ++++++++++++++++++++++++++++++++++ include/ui/qemu-pixman.h | 15 +-- include/ui/rect.h | 59 ++++++++++ hw/display/ati.c | 16 ++- hw/display/ati_2d.c | 11 +- hw/display/sm501.c | 46 +++++--- hw/display/vhost-user-gpu.c | 2 + hw/display/virtio-gpu.c | 30 ++---- system/vl.c | 84 ++++++++------- ui/console-vc-stubs.c | 33 ++++++ ui/console.c | 19 ++++ ui/dbus-listener.c | 90 +++++++++++----- ui/qemu-pixman.c | 6 ++ ui/ui-hmp-cmds.c | 2 + ui/ui-qmp-cmds.c | 2 + ui/vnc-stubs.c | 12 --- Kconfig.host | 3 + hmp-commands.hx | 2 + hw/arm/Kconfig | 3 +- hw/display/Kconfig | 7 +- hw/display/meson.build | 4 +- hw/mips/Kconfig | 1 + meson_options.txt | 2 + qemu-options.hx | 2 + scripts/meson-buildoptions.sh | 3 + ui/meson.build | 22 ++-- 29 files changed, 560 insertions(+), 141 deletions(-) create mode 100644 include/ui/pixman-minimal.h create mode 100644 include/ui/rect.h create mode 100644 ui/console-vc-stubs.c