motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-26 11:53:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

pvg: do not enable it on cross-architecture targets

Browse source 
PVG is not cross-architecture; the PVG guest drivers with x86-64 macOS do not 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 <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2025-02-19 11:18:28 +01:00
parent 6debfb2cb1
commit ae3a420fea
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Kconfig.host
View file

@ -61,3 +61,6 @@ config HV_BALLOON_POSSIBLE
config HAVE_RUST config HAVE_RUST
bool bool
config MAC_PVG
bool

4
hw/display/Kconfig
View file

@ -141,10 +141,6 @@ config XLNX_DISPLAYPORT
config DM163 config DM163
bool bool
config MAC_PVG
bool
default y
config MAC_PVG_MMIO config MAC_PVG_MMIO
bool bool
depends on MAC_PVG && AARCH64 depends on MAC_PVG && AARCH64

9
hw/display/meson.build
View file

@ -61,12 +61,9 @@ system_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c'))
system_ss.add(when: 'CONFIG_ATI_VGA', if_true: [files('ati.c', 'ati_2d.c', 'ati_dbg.c'), pixman]) system_ss.add(when: 'CONFIG_ATI_VGA', if_true: [files('ati.c', 'ati_2d.c', 'ati_dbg.c'), pixman])
if host_os == 'darwin' if pvg.found()
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.m', 'apple-gfx-pci.m'), pvg, metal])
system_ss.add(when: 'CONFIG_MAC_PVG_PCI', if_true: [files('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])
if cpu == 'aarch64'
system_ss.add(when: 'CONFIG_MAC_PVG_MMIO', if_true: [files('apple-gfx-mmio.m'), pvg, metal])
endif
endif endif
if config_all_devices.has_key('CONFIG_VIRTIO_GPU') if config_all_devices.has_key('CONFIG_VIRTIO_GPU')

6
meson.build
View file

@ -3367,6 +3367,12 @@ foreach target : target_dirs
target_kconfig += 'CONFIG_' + config_target['TARGET_ARCH'].to_upper() + '=y' target_kconfig += 'CONFIG_' + config_target['TARGET_ARCH'].to_upper() + '=y'
target_kconfig += 'CONFIG_TARGET_BIG_ENDIAN=' + config_target['TARGET_BIG_ENDIAN'] target_kconfig += 'CONFIG_TARGET_BIG_ENDIAN=' + config_target['TARGET_BIG_ENDIAN']
# 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 += 'CONFIG_MAC_PVG=y'
endif
config_input = meson.get_external_property(target, 'default') config_input = meson.get_external_property(target, 'default')
config_devices_mak = target + '-config-devices.mak' config_devices_mak = target + '-config-devices.mak'
config_devices_mak = configure_file( config_devices_mak = configure_file(