"Michael S. Tsirkin" <m...@redhat.com> wrote: > On Mon, Nov 26, 2018 at 08:59:53PM +0100, Juan Quintela wrote: >> Hi >> >> V2: >> >> - Rebase on top of master >> >> Please review. >> >> Later, Juan. > > And just making sure the point is so that one > can disable virtio-pci and still build virtio? > > And the point of that is mostly as a cleanup on > generic principles, right? Or is there a project that > actually wants to do it?
This allows "make check" to work with them disabled. Without this changes, introspection fails, because we have the "name" (kind of) "virtio-pci-blk", but not the real virtio device, so it tries to use it while it is not there. See the equivalent change for virtio-ccw-*. Thanks, Juan. PD. Without this change, you can build a qemu with virtio devices disabled (i.e. not compiled in), but it fails "make check". With the changes, it also works for "make check". > >> >> [v1] >> >From previous verision (in the middle of make check tests): >> - split also the bits of virtio-pci.h (mst suggestion) >> - add gpu, crypt and gpg bits >> - more cleanups >> - fix all the copyrights (the ones not changed have been there >> foverever) >> - be consistent with naming, vhost-* or virtio-* >> >> Please review, Juan. >> >> Juan Quintela (16): >> virtio: split vhost vsock bits from virtio-pci >> virtio: split virtio input host bits from virtio-pci >> virtio: split virtio input bits from virtio-pci >> virtio: split virtio rng bits from virtio-pci >> virtio: split virtio balloon bits from virtio-pci >> virtio: split virtio 9p bits from virtio-pci >> virtio: split vhost user blk bits from virtio-pci >> virtio: split vhost user scsi bits from virtio-pci >> virtio: split vhost scsi bits from virtio-pci >> virtio: split virtio scsi bits from virtio-pci >> virtio: split virtio blk bits rom virtio-pci >> virtio: split virtio net bits rom virtio-pci >> virtio: split virtio serial bits rom virtio-pci >> virtio: split virtio gpu bits rom virtio-pci.h >> virtio: split virtio crypto bits rom virtio-pci.h >> virtio: virtio 9p really requires CONFIG_VIRTFS to work >> >> default-configs/virtio.mak | 3 +- >> hw/display/virtio-gpu-pci.c | 14 + >> hw/display/virtio-vga.c | 1 + >> hw/virtio/Makefile.objs | 14 +- >> hw/virtio/vhost-scsi-pci.c | 95 ++++ >> hw/virtio/vhost-user-blk-pci.c | 101 ++++ >> hw/virtio/vhost-user-scsi-pci.c | 101 ++++ >> hw/virtio/vhost-vsock-pci.c | 82 ++++ >> hw/virtio/virtio-9p-pci.c | 86 ++++ >> hw/virtio/virtio-balloon-pci.c | 94 ++++ >> hw/virtio/virtio-blk-pci.c | 97 ++++ >> hw/virtio/virtio-crypto-pci.c | 14 + >> hw/virtio/virtio-input-host-pci.c | 45 ++ >> hw/virtio/virtio-input-pci.c | 154 ++++++ >> hw/virtio/virtio-net-pci.c | 96 ++++ >> hw/virtio/virtio-pci.c | 783 ------------------------------ >> hw/virtio/virtio-pci.h | 234 --------- >> hw/virtio/virtio-rng-pci.c | 86 ++++ >> hw/virtio/virtio-scsi-pci.c | 106 ++++ >> hw/virtio/virtio-serial-pci.c | 112 +++++ >> tests/Makefile.include | 18 +- >> 21 files changed, 1308 insertions(+), 1028 deletions(-) >> create mode 100644 hw/virtio/vhost-scsi-pci.c >> create mode 100644 hw/virtio/vhost-user-blk-pci.c >> create mode 100644 hw/virtio/vhost-user-scsi-pci.c >> create mode 100644 hw/virtio/vhost-vsock-pci.c >> create mode 100644 hw/virtio/virtio-9p-pci.c >> create mode 100644 hw/virtio/virtio-balloon-pci.c >> create mode 100644 hw/virtio/virtio-blk-pci.c >> create mode 100644 hw/virtio/virtio-input-host-pci.c >> create mode 100644 hw/virtio/virtio-input-pci.c >> create mode 100644 hw/virtio/virtio-net-pci.c >> create mode 100644 hw/virtio/virtio-rng-pci.c >> create mode 100644 hw/virtio/virtio-scsi-pci.c >> create mode 100644 hw/virtio/virtio-serial-pci.c >> >> -- >> 2.19.1 >>