Maybe not the most elegant but rather simple approach to the "parent object missing" problem: Use a symbol reference to make sure ccw modules load only in case ccw support is present.
Also split the cpu changes to a separate patch. Gerd Hoffmann (3): s390x: move S390_ADAPTER_SUPPRESSIBLE s390x: add have_virtio_ccw s390x: modularize virtio-gpu-ccw hw/s390x/virtio-ccw.h | 5 +++++ include/hw/s390x/css.h | 7 ------- include/hw/s390x/s390_flic.h | 3 +++ target/s390x/cpu.h | 9 ++++++--- hw/s390x/virtio-ccw-gpu.c | 4 +++- hw/s390x/virtio-ccw.c | 2 ++ util/module.c | 1 + hw/s390x/meson.build | 8 +++++++- 8 files changed, 27 insertions(+), 12 deletions(-) -- 2.30.2