I have looked recently at moving some of the vhost-user definitions from configure options to Kconfig symbols. This made some of the vhost symbols target-dependent (and thus poisoned) where they used to be defined in config-host.h.
To fix this, this series removes these symbols (and all other code that is not needed outside individual virtio-ccw device implementations) from the virtio-ccw.h header. I am sending it separately because I think it's a worthwhile cleanup on its own. Paolo Paolo Bonzini (4): s390x: follow qdev tree to detect SCSI device on a CCW bus virtio-ccw: move vhost_ccw_scsi to a separate file virtio-ccw: move device type declarations to .c files virtio-ccw: do not include headers for all virtio devices hw/s390x/ipl.c | 23 ++++-- hw/s390x/meson.build | 1 + hw/s390x/s390-virtio-ccw.c | 1 + hw/s390x/vhost-scsi-ccw.c | 73 +++++++++++++++++ hw/s390x/vhost-vsock-ccw.c | 9 ++ hw/s390x/virtio-ccw-9p.c | 9 ++ hw/s390x/virtio-ccw-balloon.c | 9 ++ hw/s390x/virtio-ccw-blk.c | 9 ++ hw/s390x/virtio-ccw-crypto.c | 9 ++ hw/s390x/virtio-ccw-gpu.c | 9 ++ hw/s390x/virtio-ccw-input.c | 20 +++++ hw/s390x/virtio-ccw-net.c | 9 ++ hw/s390x/virtio-ccw-rng.c | 9 ++ hw/s390x/virtio-ccw-scsi.c | 56 ++----------- hw/s390x/virtio-ccw-serial.c | 9 ++ hw/s390x/virtio-ccw.c | 2 + hw/s390x/virtio-ccw.h | 149 ---------------------------------- 17 files changed, 202 insertions(+), 204 deletions(-) create mode 100644 hw/s390x/vhost-scsi-ccw.c -- 2.35.1