virtio-gpu: only compile virtio-gpu-3d.c for CONFIG_VIRGL=y
PATCH 1/1 virtio-gpu: only compile virtio-gpu-3d.c for CONFIG_VIRGL=y
There is no actual code in the CONFIG_VIRGL=n case. So building is
(a) pointless and (b) makes macos ranlib complain.
--- hw/display/virtio-gpu-3d.c | 4 ---- hw/display/meson.build | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-)
hw/display/virtio-gpu-3d.c +0 -4
@@ -17,8 +17,6 @@#include "hw/virtio/virtio.h" #include "hw/virtio/virtio-gpu.h" -#ifdef CONFIG_VIRGL -#include <virglrenderer.h> static struct virgl_renderer_callbacks virtio_gpu_3d_cbs;
@@ -633,5 +631,3 @@ int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g)return capset2_max_ver ?2 :1 ; } - -#endif /* CONFIG_VIRGL */
hw/display/meson.build +3 -1
@@ -57,7 +57,9 @@ softmmu_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'ati_2d if config_all_devices.has_key('CONFIG_VIRTIO_GPU') virtio_gpu_ss = ss.source_set() virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_GPU', - if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c', 'virtio-gpu-3d.c'), pixman, virgl]) + if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c'), pixman, virgl]) + virtio_gpu_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRGL'], + if_true: [files('virtio-gpu-3d.c'), pixman, virgl]) virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_GPU', if_true: files('vhost-user-gpu.c')) hw_display_modules += {'virtio-gpu': virtio_gpu_ss} endif
Signature · 1 line
2.27.0
Quoted 6 lines · Gerd Hoffmann
There is no actual code in the
CONFIG_VIRGL=ncase. So building is
(a) pointless and (b) makes macos ranlib complain.Reported-by Paolo Bonzini <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>
---
Quoted 47 lines
hw/display/virtio-gpu-3d.c | 4 ---- hw/display/meson.build | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-)hw/display/virtio-gpu-3d.c +0
-4@@ -17,8 +17,6 @@#include "hw/virtio/virtio.h" #include "hw/virtio/virtio-gpu.h" -#ifdef CONFIG_VIRGL -#include <virglrenderer.h> static struct virgl_renderer_callbacks virtio_gpu_3d_cbs;@@ -633,5 +631,3 @@ int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g)return capset2_max_ver ?2 :1 ; } - -#endif /* CONFIG_VIRGL */ hw/display/meson.build +0
-0@@ -57,7 +57,9 @@ softmmu_ss.add(when: [pixman, 'CONFIG_ATI_VGA'],
if_true: files('ati.c', 'ati_2d
ifconfig_all_devices.has_key('CONFIG_VIRTIO_GPU')
virtio_gpu_ss=ss.source_set()virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_GPU',
-if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c',
'virtio-gpu-3d.c'), pixman, virgl])
+if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c'),
pixman, virgl])hw/display/meson.build +2
-0+ virtio_gpu_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRGL'], + if_true: [files('virtio-gpu-3d.c'), pixman, virgl]) virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_GPU', if_true:files('vhost-user-gpu.c'))
hw_display_modules+= {'virtio-gpu':virtio_gpu_ss}
endif
--
2.27.0
Signature · 1 line
Marc-André Lureau
Quoted 34 lines · Gerd Hoffmann
There is no actual code in the
CONFIG_VIRGL=ncase. So building is
(a) pointless and (b) makes macos ranlib complain.Reported-by Paolo Bonzini <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>--- hw/display/virtio-gpu-3d.c | 4 ---- hw/display/meson.build | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-)hw/display/virtio-gpu-3d.c +0
-4@@ -17,8 +17,6 @@#include "hw/virtio/virtio.h" #include "hw/virtio/virtio-gpu.h" -#ifdef CONFIG_VIRGL -#include <virglrenderer.h> static struct virgl_renderer_callbacks virtio_gpu_3d_cbs;@@ -633,5 +631,3 @@ int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g)return capset2_max_ver ?2 :1 ; } - -#endif /* CONFIG_VIRGL */ hw/display/meson.build +0
-0
hw/display/meson.build softmmu_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'ati_2d · line 65
Quoted 10 lines
hw/display/meson.build +3
-1@@ -57,7 +57,9 @@ softmmu_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'ati_2d if config_all_devices.has_key('CONFIG_VIRTIO_GPU') virtio_gpu_ss = ss.source_set() virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_GPU', - if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c', 'virtio-gpu-3d.c'), pixman, virgl]) + if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c'), pixman, virgl]) + virtio_gpu_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRGL'], + if_true: [files('virtio-gpu-3d.c'), pixman, virgl]) virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_GPU', if_true: files('vhost-user-gpu.c')) hw_display_modules += {'virtio-gpu': virtio_gpu_ss} endif
Mark suggested to test this patch to see if this solve the issue introduced by commit da0dfe251d7 ("build: fix macOS --enable-modules build") but it does not:
missing object type 'virtio-gpu-device'
Broken pipe../tests/qtest/libqtest.c:176: kill_qemu() detected QEMU death from signal 6 (Abort trap: 6)
ERROR qtest-aarch64/device-introspect-test - too few tests run (expected 6, got 5)
gmake: *** [Makefile.mtest:905: run-test-111] Error 1