adcf33a504
Since the virtio-gpu-ccw device depends on the hw-display-virtio-gpu module, which provides the type virtio-gpu-device, packaging the hw-display-virtio-gpu module as a separate package that may or may not be installed along with the qemu package leads to problems. Namely if the hw-display-virtio-gpu is absent, qemu continues to advertise virtio-gpu-ccw, but it aborts not only when one attempts using virtio-gpu-ccw, but also when libvirtd's capability probing tries to instantiate the type to introspect it. Let us thus introduce a module named hw-s390x-virtio-gpu-ccw that is going to provide the virtio-gpu-ccw device. The hw-s390x prefix was chosen because it is not a portable device. With virtio-gpu-ccw built as a module, the correct way to package a modularized qemu is to require that hw-display-virtio-gpu must be installed whenever the module hw-s390x-virtio-gpu-ccw. Signed-off-by: Halil Pasic <pasic@linux.ibm.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Halil Pasic <pasic@linux.ibm.com> Tested-by: Halil Pasic <pasic@linux.ibm.com> Message-Id: <20210317095622.2839895-4-kraxel@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
57 lines
2.0 KiB
Meson
57 lines
2.0 KiB
Meson
s390x_ss = ss.source_set()
|
|
s390x_ss.add(files(
|
|
'ap-bridge.c',
|
|
'ap-device.c',
|
|
'ccw-device.c',
|
|
'css-bridge.c',
|
|
'css.c',
|
|
'event-facility.c',
|
|
'ipl.c',
|
|
's390-ccw.c',
|
|
's390-pci-bus.c',
|
|
's390-pci-inst.c',
|
|
's390-skeys.c',
|
|
's390-stattrib.c',
|
|
's390-virtio-hcall.c',
|
|
'sclp.c',
|
|
'sclpcpu.c',
|
|
'sclpquiesce.c',
|
|
'tod-qemu.c',
|
|
'tod.c',
|
|
))
|
|
s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
|
|
'tod-kvm.c',
|
|
's390-skeys-kvm.c',
|
|
's390-stattrib-kvm.c',
|
|
'pv.c',
|
|
))
|
|
s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-ccw.c'))
|
|
s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c'))
|
|
s390x_ss.add(when: 'CONFIG_VFIO', if_true: files('s390-pci-vfio.c'))
|
|
|
|
virtio_ss = ss.source_set()
|
|
virtio_ss.add(files('virtio-ccw.c'))
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-ccw-balloon.c'))
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-ccw-blk.c'))
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-ccw-crypto.c'))
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-ccw-input.c'))
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-ccw-net.c'))
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-ccw-rng.c'))
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_SCSI', if_true: files('virtio-ccw-scsi.c'))
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-ccw-serial.c'))
|
|
if have_virtfs
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-ccw-9p.c'))
|
|
endif
|
|
virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-ccw.c'))
|
|
virtio_ss.add(when: 'CONFIG_VHOST_USER_FS', if_true: files('vhost-user-fs-ccw.c'))
|
|
s390x_ss.add_all(when: 'CONFIG_VIRTIO_CCW', if_true: virtio_ss)
|
|
|
|
hw_arch += {'s390x': s390x_ss}
|
|
|
|
hw_s390x_modules = {}
|
|
virtio_gpu_ccw_ss = ss.source_set()
|
|
virtio_gpu_ccw_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRTIO_CCW'],
|
|
if_true: [files('virtio-ccw-gpu.c'), pixman])
|
|
hw_s390x_modules += {'virtio-gpu-ccw': virtio_gpu_ccw_ss}
|
|
modules += {'hw-s390x': hw_s390x_modules}
|