The vhost-user-blk bits in meson.build and Maintainers should probably
be in patch 8?
Otherwise LGTM.
On Fri, Aug 26, 2022 at 05:32:45PM +0300, Daniil Tatianin wrote:
> This way we can reuse it for other virtio-blk devices, e.g
> vhost-user-blk, which currently does not control its config space size
> dynamically.
>
> Signed-off-by: Daniil Tatianin <d-tatia...@yandex-team.ru>
> ---
> MAINTAINERS | 4 +++
> hw/block/meson.build | 4 +--
> hw/block/virtio-blk-common.c | 39 +++++++++++++++++++++++++++
> hw/block/virtio-blk.c | 24 ++---------------
> include/hw/virtio/virtio-blk-common.h | 20 ++++++++++++++
> 5 files changed, 67 insertions(+), 24 deletions(-)
> create mode 100644 hw/block/virtio-blk-common.c
> create mode 100644 include/hw/virtio/virtio-blk-common.h
>
<snip>
i.e. move this.
> @@ -2271,11 +2273,13 @@ S: Maintained
> F: contrib/vhost-user-blk/
> F: contrib/vhost-user-scsi/
> F: hw/block/vhost-user-blk.c
> +F: hw/block/virtio-blk-common.c
> F: hw/scsi/vhost-user-scsi.c
> F: hw/virtio/vhost-user-blk-pci.c
> F: hw/virtio/vhost-user-scsi-pci.c
> F: include/hw/virtio/vhost-user-blk.h
> F: include/hw/virtio/vhost-user-scsi.h
> +F: include/hw/virtio/virtio-blk-common.h
>
> vhost-user-gpu
> M: Marc-André Lureau <marcandre.lur...@redhat.com>
> diff --git a/hw/block/meson.build b/hw/block/meson.build
> index 2389326112..1908abd45c 100644
> --- a/hw/block/meson.build
> +++ b/hw/block/meson.build
> @@ -16,7 +16,7 @@ softmmu_ss.add(when: 'CONFIG_SWIM', if_true:
> files('swim.c'))
> softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c'))
> softmmu_ss.add(when: 'CONFIG_TC58128', if_true: files('tc58128.c'))
>
> -specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
> -specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true:
> files('vhost-user-blk.c'))
> +specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c',
> 'virtio-blk-common.c'))
And this
> +specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true:
> files('vhost-user-blk.c', 'virtio-blk-common.c'))
