From patchwork Wed Oct 18 13:38:01 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: 1850857 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=QeBrSoJ2; 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-devel-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 4S9X6M6Rvbz20cx for ; Thu, 19 Oct 2023 00:40:27 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt6l6-00081h-Mj; Wed, 18 Oct 2023 09:38:48 -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 1qt6l4-0007va-Kh for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:38:46 -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 1qt6l2-00069l-L4 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 09:38:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697636324; 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=hg0biFB7vETvgcvc8KpZ1Cbgo5SlKmszX0I8iHxn70Y=; b=QeBrSoJ2XsuK2PJMh2xtBomes8NWWJ6mNj8u/VUTW50E+ipaLR6KiXbT5QRXVMlWrI+AN+ 28BwP/sOHeT7gLPjsHKjicUuEDLBleGzkUIEVwITyUnWeky0cbIL/NuofBHsD9Zw16f0zh FEWKfuekfhV/J2NV+SI9sFVxMs/3jJ0= 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-360-8HYfpNMbPPCObeGRaVOSIg-1; Wed, 18 Oct 2023 09:38:26 -0400 X-MC-Unique: 8HYfpNMbPPCObeGRaVOSIg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 14C13185A7B5; Wed, 18 Oct 2023 13:38:25 +0000 (UTC) Received: from localhost (unknown [10.39.208.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A00F492BFA; Wed, 18 Oct 2023 13:38:23 +0000 (UTC) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, BALATON Zoltan , "Dr. David Alan Gilbert" , qemu-ppc@nongnu.org, Markus Armbruster , Gerd Hoffmann , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Peter Maydell , Eric Blake , "Michael S. Tsirkin" Subject: [PATCH v4 00/19] Make Pixman an optional dependency Date: Wed, 18 Oct 2023 17:38:01 +0400 Message-ID: <20231018133820.1556962-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 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=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-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 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 (19): build-sys: add a "pixman" feature ui: compile out some qemu-pixman functions when !PIXMAN ui: add pixman-compat.h 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/display: make ATI_VGA depend on PIXMAN build-sys: make pixman actually optional configs/devices/mips64el-softmmu/default.mak | 2 +- meson.build | 25 ++- qapi/ui.json | 3 +- include/ui/console.h | 2 + include/ui/pixman-compat.h | 195 +++++++++++++++++++ include/ui/qemu-pixman.h | 11 +- include/ui/rect.h | 59 ++++++ hw/display/sm501.c | 59 ++++-- hw/display/vhost-user-gpu.c | 2 + hw/display/virtio-gpu.c | 30 ++- system/vl.c | 64 +++--- 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 + Kconfig.host | 3 + hmp-commands.hx | 2 + hw/arm/Kconfig | 3 +- hw/display/Kconfig | 9 +- hw/display/meson.build | 4 +- meson_options.txt | 2 + scripts/meson-buildoptions.sh | 3 + ui/meson.build | 24 +-- 25 files changed, 537 insertions(+), 117 deletions(-) create mode 100644 include/ui/pixman-compat.h create mode 100644 include/ui/rect.h create mode 100644 ui/console-vc-stubs.c