From nobody Sun Feb 23 05:21:32 2025 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=1740058493; cv=none; d=zohomail.com; s=zohoarc; b=c9IzjXOJ5wNm6aQBCpIz92vhLMuAP68NdI40SmwFvZjZqNIj+yNcnSUWecwqrKqSlZEr4525CbDMt6tdF803RAc+0aZ384t5oDm+Xx1yiYn0GNKgHQXZ2iM8AddKkVR0kqZovOrE+uJdVuD99GVHyEZbtB/Bcq/gDE50xghrihQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1740058493; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3r5BzHwwGLE8w4wpYRt2uj1rsGj25j/C0CBMCevqqBU=; b=BYlhkVmQpUVIyVZCiaLJXqXR1Rzid+7nrGgO4iRpwcI8fmcJGNOYoMsHVa5sRw3B5Z6zxI+NmSaH0tGIkxYSB+XNVSWOsPsAmrLG3cOjd+2VaxaSc2xdG4UQs4o9YQMgrAPJHhPVvb4jJcx3eUw1eC7TB+kyEDUWQ5rpTP7IOto= 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 1740058488878523.9654978263574; Thu, 20 Feb 2025 05:34:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tl6gR-0003eI-3S; Thu, 20 Feb 2025 08:33:44 -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 1tl6g4-0003cO-4p for qemu-devel@nongnu.org; Thu, 20 Feb 2025 08:33:27 -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 1tl6fz-00081l-TM for qemu-devel@nongnu.org; Thu, 20 Feb 2025 08:33:19 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-136-aLWKjP00M52JCOtlYgq5vQ-1; Thu, 20 Feb 2025 08:33:12 -0500 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-38f55ccb04bso628836f8f.3 for ; Thu, 20 Feb 2025 05:33:12 -0800 (PST) Received: from [192.168.10.48] ([176.206.122.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f25914d73sm21010745f8f.54.2025.02.20.05.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 05:33:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740058393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3r5BzHwwGLE8w4wpYRt2uj1rsGj25j/C0CBMCevqqBU=; b=e6RHocxtb7EgRL0Zoed8KreXNyr2LLD8azXAL9FGwD2NqG0wo6pmR6KfCYCzNe5SB78KQq QkXwTvJRbCb3CueC/Q3si0mDW4nzwLADMJflyq+m4W5mgTeYowZH6oohDKG00rJvfWakWw EGj7hnv8ZNQ+cJ8JWf/7kCpaOSQ7Uj8= X-MC-Unique: aLWKjP00M52JCOtlYgq5vQ-1 X-Mimecast-MFC-AGG-ID: aLWKjP00M52JCOtlYgq5vQ_1740058391 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740058390; x=1740663190; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3r5BzHwwGLE8w4wpYRt2uj1rsGj25j/C0CBMCevqqBU=; b=KMnCZqzqaex3BkChmRh+CDetfP49xHA9qjxWEq6Aw+6feqdHfRDsvj4DwD2+Govnk7 cAg2//NKkS0X7Fd1uMcm4nCkiDLoeWKGMeHZSCXTQAHrifdIN1TdSzb9t65IMcvZ0e/U RhC5ZGhWLhNqryX4cCub7L1mqsLsetfXRQQ7TwkyShB9JnB3zqdDGuyybOGxRURHzIBM gzALsWIbaPJFc1yRXkSfvQl4fIBgryZCTZnTz+X8BWeO+HTiKKrk37J3jBTTySZ87VkZ 4Dmz6K60vEHLd0bWOk3F0fiPUskuoLaQO2HbPKzYOmnqRcwwF70iehKgw3IyI8MMLm/m v4zQ== X-Gm-Message-State: AOJu0YxLWFvNXZO1qGZzeXMOalFqXI3R8b1XqV6xAw3kNuxnJ9ztUuqr ap1s8R6qBlUc1SXPpw4SR6H/6LGt6hYNNBAijfdbSMb9Wovvwogq9PZVsdHD9rqflZIn9DFetev C878bV/Fzl8Esy0pU/atOyLfx4HcjKGDp/YZ0kPsF71NWYNy6vW1mcIeP+978NpL4/4SRWU7Mfm vifP9TxXRXQ1QLv4ajy+6pBl1uDrnqZ5HNriLcPY8= X-Gm-Gg: ASbGncuyd/DoEegwQlp5ZtFvHxy6XFFiLEIx/rSpE60P7q+BBYij1eIsQHqhmEIRzy3 aDM6VdMTzsTuKIs7I5SfVE1dUcUb7kkwyeC0/l4BOnSgRbrt2StR3NAnsnhITnNKAD45vYh3mjJ P/Poywqc7f8qYFMBNgzP+wLY4sFrcLZ+KSVemVhW1BohYn3uBiLhMMgvCPkycyc3RsLJLWJ+jqf VyYa/IUUt0+bJG4ur96Q9KhBA9p4KEk2jcOfaz4O/77gQX+KL9efenG3C0v8gG2A18V6JqNWzZQ c8B4cWDNYwg= X-Received: by 2002:a05:6000:712:b0:38f:2766:759f with SMTP id ffacd0b85a97d-38f587ca5c4mr6813248f8f.41.1740058389931; Thu, 20 Feb 2025 05:33:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IHryIqD6TUAbszIvZ4RYaXVPLhzQGY+jeQeO5PavQqs2XJLBL+2C+bhCOeh/VCSeVXRL4nrMA== X-Received: by 2002:a05:6000:712:b0:38f:2766:759f with SMTP id ffacd0b85a97d-38f587ca5c4mr6813221f8f.41.1740058389417; Thu, 20 Feb 2025 05:33:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Phil Dennis-Jordan Subject: [PATCH 1/2] pvg: do not enable it on cross-architecture targets Date: Thu, 20 Feb 2025 14:33:05 +0100 Message-ID: <20250220133306.1104382-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250220133306.1104382-1-pbonzini@redhat.com> References: <20250220133306.1104382-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.457, 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_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1740058494920019000 Content-Type: text/plain; charset="utf-8" PVG is not cross-architecture; the PVG guest drivers with x86-64 macOS do n= ot give useful results with the aarch64 macOS host PVG framework, and vice versa. To express this repurpose CONFIG_MAC_PVG, making it true only if the target= has the same architecture as the host. Furthermore, remove apple-gfx.m unless one of the devices is actually present. Signed-off-by: Paolo Bonzini --- meson.build | 6 ++++++ Kconfig.host | 3 +++ hw/display/Kconfig | 4 ---- hw/display/meson.build | 9 +++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 0ee79c664d3..ad2c6b61930 100644 --- a/meson.build +++ b/meson.build @@ -3367,6 +3367,12 @@ foreach target : target_dirs target_kconfig +=3D 'CONFIG_' + config_target['TARGET_ARCH'].to_upper(= ) + '=3Dy' target_kconfig +=3D 'CONFIG_TARGET_BIG_ENDIAN=3D' + config_target['TAR= GET_BIG_ENDIAN'] =20 + # PVG is not cross-architecture. Use accelerator_targets as a proxy to + # figure out which target can support PVG on this host + if pvg.found() and target in accelerator_targets.get('CONFIG_HVF', []) + target_kconfig +=3D 'CONFIG_MAC_PVG=3Dy' + endif + config_input =3D meson.get_external_property(target, 'default') config_devices_mak =3D target + '-config-devices.mak' config_devices_mak =3D configure_file( diff --git a/Kconfig.host b/Kconfig.host index 842cbe0d6c5..933425c74b4 100644 --- a/Kconfig.host +++ b/Kconfig.host @@ -61,3 +61,6 @@ config HV_BALLOON_POSSIBLE =20 config HAVE_RUST bool + +config MAC_PVG + bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 2b53dfd7d26..1e95ab28ef4 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -141,10 +141,6 @@ config XLNX_DISPLAYPORT config DM163 bool =20 -config MAC_PVG - bool - default y - config MAC_PVG_MMIO bool depends on MAC_PVG && AARCH64 diff --git a/hw/display/meson.build b/hw/display/meson.build index 94f4f05d36f..b9bdf219103 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -61,12 +61,9 @@ system_ss.add(when: 'CONFIG_ARTIST', if_true: files('art= ist.c')) =20 system_ss.add(when: 'CONFIG_ATI_VGA', if_true: [files('ati.c', 'ati_2d.c',= 'ati_dbg.c'), pixman]) =20 -if host_os =3D=3D 'darwin' - system_ss.add(when: 'CONFIG_MAC_PVG', if_true: [files('apple-gfx= .m'), pvg, metal]) - system_ss.add(when: 'CONFIG_MAC_PVG_PCI', if_true: [files('apple-gfx= -pci.m'), pvg, metal]) - if cpu =3D=3D 'aarch64' - system_ss.add(when: 'CONFIG_MAC_PVG_MMIO', if_true: [files('apple-gfx= -mmio.m'), pvg, metal]) - endif +if pvg.found() + system_ss.add(when: 'CONFIG_MAC_PVG_PCI', if_true: [files('apple-gfx= .m', 'apple-gfx-pci.m'), pvg, metal]) + system_ss.add(when: 'CONFIG_MAC_PVG_MMIO', if_true: [files('apple-gfx= .m', 'apple-gfx-mmio.m'), pvg, metal]) endif =20 if config_all_devices.has_key('CONFIG_VIRTIO_GPU') --=20 2.48.1 From nobody Sun Feb 23 05:21:32 2025 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=1740058488; cv=none; d=zohomail.com; s=zohoarc; b=EM7YkySL/osjHWT3C3RgSMIP/bd4aSDtcnapQUSjgGFcjDIwDUnLiN4HZupNibSjoh8eYOR1Svq+XYnQeN0tCHnF/zWgHnkQIYKzqkQxbDd5mP4wXpB+Kuw8LmTP2Ux5ooZevFToDk/6Zxf1f2UCtYP7umTudJ13Qq2P43fMjJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1740058488; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ad54lpnjxvoljK6bbFtYkvpstO0cRMtfo3otsnkNusw=; b=Tv+8ITdh0qDFbMheZGdqpjUKOSHrapDGFEZSvBvfhq/O+VDZFr8NbzbvHfOQ/b37rj80F12DOCqBw+QzAfUbluto1k0dxLCoUjSRTSuaBqv+c56RT1efi0sTKrf3nGbbWG1maM+WV5vMKivDuxLo1BsCv1FpwA35/vD3F94aYuk= 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 1740058488874677.2384312532694; Thu, 20 Feb 2025 05:34:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tl6gZ-0003hJ-QQ; Thu, 20 Feb 2025 08:33:51 -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 1tl6g3-0003cF-67 for qemu-devel@nongnu.org; Thu, 20 Feb 2025 08:33:21 -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 1tl6g1-000822-7W for qemu-devel@nongnu.org; Thu, 20 Feb 2025 08:33:18 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-272--qdjGoVnP9e95nHtMPNRVw-1; Thu, 20 Feb 2025 08:33:14 -0500 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-38f44be93a8so470975f8f.1 for ; Thu, 20 Feb 2025 05:33:14 -0800 (PST) Received: from [192.168.10.48] ([176.206.122.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f258ccd51sm20675503f8f.29.2025.02.20.05.33.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 05:33:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740058395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ad54lpnjxvoljK6bbFtYkvpstO0cRMtfo3otsnkNusw=; b=VmJ9ORiRP6jE7iiVyZXxYkgos4ptSnc4jkwakkYf8iagiQfuEkeo2NKJjRrUnVHxsBtWv2 OMQ59tbOfieW4x5tJs/dGtzU20Z1KZd/3Vr0Vtwb/udCjbBRZcAqiimBggaLXpTnkxAUx1 jIdT3nwGQ1b0kkO/BNbwaEifU+krBp4= X-MC-Unique: -qdjGoVnP9e95nHtMPNRVw-1 X-Mimecast-MFC-AGG-ID: -qdjGoVnP9e95nHtMPNRVw_1740058393 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740058393; x=1740663193; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ad54lpnjxvoljK6bbFtYkvpstO0cRMtfo3otsnkNusw=; b=SEmZNS820lQJ8eUVO7eqF9iQ+xEDL3JZn5NA48rP4sjKGT2kq+21NL+gXE5867lT5G jv3qP5+JTuQSALvTfDgYBixsN8Ovlb5bFexygrnsJsDHK6YwjK13OD2o7NiO0ocBVMBI KvOUs4VVurWwoMuqlY36iimcpgaAomy4ebT3L2vmjbhqRUd4wWWbEVusMXMWzus32xM1 q94TaJOyHNDYTBUntSsaTrFa0d8Gi2EvXniSNzrhDvif6+Gk1Yu4acunfDSwmt9hXuPQ DxVMNx+8/IaS+79WLdmcBM97DJJQwn/zPkonhvW/0iGyURchuiVEaTfEpqbUzneuwXsx IVzg== X-Gm-Message-State: AOJu0YwCk6S4FYkJ2JBGhGwYj6g2j7W6yKCxiU/JczfV0MHA7+8UsI+B 2VMVUTUH5LSVLWGgmAIB1pSOxkaLkViotZ+kqrJnC32Zu9SMFqT4LicXOWJ57OLTcfyGyEyXrfp Ain45xlVB32H2tB0V4gghUlNLRzSLp/1hh5peBry0scgDqypQ6Saq6rRee6dFvTXxYaaRXPI9AA d2hOvCnAbbwKLOG7nyfhYnxRWij93dGmixHga3YUc= X-Gm-Gg: ASbGncv2cK66zrOFaF1XExlTKV+G2D9FR0r5G7fZNtrqyKvEkaqEqA70Ej5lMcie+FZ +tDfj3eh20GnBvosUjA1T21Wmd/r/ccr0sqJr2nVuNRuOoallWtM6CGdgOyHLd4dRFJghLB+2iG uy0sxr18LlUy8bXJ7ovhlwfpdrycYHM0MGj4GbF4P3LKya2dLbG/h+KqMX4hlQVmakkRG1+qImH wYCWyCclfPBRuuGj9P+I4NCridqf0qQ37wPmVc3cxjriSn5qSSWminDReH51uKIckH1IO/yzOS8 4FzJAcW7+kY= X-Received: by 2002:a5d:4403:0:b0:38f:24f4:93b9 with SMTP id ffacd0b85a97d-38f587974dfmr6195062f8f.28.1740058392804; Thu, 20 Feb 2025 05:33:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IGwXijjdw72HWL8fprHbQLsrRPFdt8GmsLN8XwRmdHpDXM6C7hqlr9e0Xkb1i3qvBo/PLsQNg== X-Received: by 2002:a5d:4403:0:b0:38f:24f4:93b9 with SMTP id ffacd0b85a97d-38f587974dfmr6195041f8f.28.1740058392438; Thu, 20 Feb 2025 05:33:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Phil Dennis-Jordan Subject: [PATCH 2/2] pvg: add option to configure it out Date: Thu, 20 Feb 2025 14:33:06 +0100 Message-ID: <20250220133306.1104382-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250220133306.1104382-1-pbonzini@redhat.com> References: <20250220133306.1104382-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.457, 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_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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: 1740058492856019100 Content-Type: text/plain; charset="utf-8" ... and also to require it (--enable-pvg). While at it, unify the dependen= cy() call for pvg and metal, which simplifies the logic a bit. Note that all other Apple frameworks are either required or always-present, therefore do not add them to the summary in the same way as PVG. Signed-off-by: Paolo Bonzini --- meson.build | 8 +++++--- hw/display/meson.build | 4 ++-- meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 3 +++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index ad2c6b61930..ad8e7c1890e 100644 --- a/meson.build +++ b/meson.build @@ -821,7 +821,6 @@ version_res =3D [] coref =3D [] iokit =3D [] pvg =3D not_found -metal =3D [] emulator_link_args =3D [] midl =3D not_found widl =3D not_found @@ -843,8 +842,8 @@ elif host_os =3D=3D 'darwin' coref =3D dependency('appleframeworks', modules: 'CoreFoundation') iokit =3D dependency('appleframeworks', modules: 'IOKit', required: fals= e) host_dsosuf =3D '.dylib' - pvg =3D dependency('appleframeworks', modules: 'ParavirtualizedGraphics') - metal =3D dependency('appleframeworks', modules: 'Metal') + pvg =3D dependency('appleframeworks', modules: ['ParavirtualizedGraphics= ', 'Metal'], + required: get_option('pvg')) elif host_os =3D=3D 'sunos' socket =3D [cc.find_library('socket'), cc.find_library('nsl'), @@ -4846,6 +4847,9 @@ summary_info +=3D {'libdw': libdw} if host_os =3D=3D 'freebsd' summary_info +=3D {'libinotify-kqueue': inotify} endif +if host_os =3D=3D 'darwin' + summary_info +=3D {'ParavirtualizedGraphics support': pvg} +endif summary(summary_info, bool_yn: true, section: 'Dependencies') =20 if host_arch =3D=3D 'unknown' diff --git a/hw/display/meson.build b/hw/display/meson.build index b9bdf219103..9d82fbc9c89 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -62,8 +62,8 @@ system_ss.add(when: 'CONFIG_ARTIST', if_true: files('arti= st.c')) system_ss.add(when: 'CONFIG_ATI_VGA', if_true: [files('ati.c', 'ati_2d.c',= 'ati_dbg.c'), pixman]) =20 if pvg.found() - system_ss.add(when: 'CONFIG_MAC_PVG_PCI', if_true: [files('apple-gfx= .m', 'apple-gfx-pci.m'), pvg, metal]) - system_ss.add(when: 'CONFIG_MAC_PVG_MMIO', if_true: [files('apple-gfx= .m', 'apple-gfx-mmio.m'), pvg, metal]) + system_ss.add(when: 'CONFIG_MAC_PVG_PCI', if_true: [files('apple-gfx= .m', 'apple-gfx-pci.m'), pvg]) + system_ss.add(when: 'CONFIG_MAC_PVG_MMIO', if_true: [files('apple-gfx= .m', 'apple-gfx-mmio.m'), pvg]) endif =20 if config_all_devices.has_key('CONFIG_VIRTIO_GPU') diff --git a/meson_options.txt b/meson_options.txt index 5eeaf3eee5c..59d973bca00 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -198,6 +198,8 @@ option('lzfse', type : 'feature', value : 'auto', description: 'lzfse support for DMG images') option('lzo', type : 'feature', value : 'auto', description: 'lzo compression support') +option('pvg', type: 'feature', value: 'auto', + description: 'macOS paravirtualized graphics support') option('rbd', type : 'feature', value : 'auto', description: 'Ceph block device driver') option('opengl', type : 'feature', value : 'auto', diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index a8066aab037..3e8e00852b2 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -168,6 +168,7 @@ meson_options_help() { printf "%s\n" ' pixman pixman support' printf "%s\n" ' plugins TCG plugins via shared library loading' printf "%s\n" ' png PNG support with libpng' + printf "%s\n" ' pvg macOS paravirtualized graphics support' printf "%s\n" ' qatzip QATzip compression support' printf "%s\n" ' qcow1 qcow1 image format support' printf "%s\n" ' qed qed image format support' @@ -436,6 +437,8 @@ _meson_option_parse() { --enable-png) printf "%s" -Dpng=3Denabled ;; --disable-png) printf "%s" -Dpng=3Ddisabled ;; --prefix=3D*) quote_sh "-Dprefix=3D$2" ;; + --enable-pvg) printf "%s" -Dpvg=3Denabled ;; + --disable-pvg) printf "%s" -Dpvg=3Ddisabled ;; --enable-qatzip) printf "%s" -Dqatzip=3Denabled ;; --disable-qatzip) printf "%s" -Dqatzip=3Ddisabled ;; --enable-qcow1) printf "%s" -Dqcow1=3Denabled ;; --=20 2.48.1