| Message ID | 20230523163600.83391-4-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/virtio: Build various target-agnostic objects just once | expand |
On 5/23/23 09:35, Philippe Mathieu-Daudé wrote: > We will modify this file shortly. Re-arrange it slightly first, > declaring source sets first. > > No logical change. > > Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org> > --- > hw/scsi/meson.build | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 23/05/2023 18.35, Philippe Mathieu-Daudé wrote: > We will modify this file shortly. Re-arrange it slightly first, > declaring source sets first. > > No logical change. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/scsi/meson.build | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build > index fa9198e69f..f3206a4756 100644 > --- a/hw/scsi/meson.build > +++ b/hw/scsi/meson.build > @@ -1,4 +1,7 @@ > scsi_ss = ss.source_set() > +specific_scsi_ss = ss.source_set() > +virtio_scsi_ss = ss.source_set() > + > scsi_ss.add(files( > 'emulation.c', > 'scsi-bus.c', > @@ -11,18 +14,13 @@ scsi_ss.add(when: 'CONFIG_LSI_SCSI_PCI', if_true: files('lsi53c895a.c')) > scsi_ss.add(when: 'CONFIG_MEGASAS_SCSI_PCI', if_true: files('megasas.c')) > scsi_ss.add(when: 'CONFIG_MPTSAS_SCSI_PCI', if_true: files('mptsas.c', 'mptconfig.c', 'mptendian.c')) > scsi_ss.add(when: 'CONFIG_VMW_PVSCSI_SCSI_PCI', if_true: files('vmw_pvscsi.c')) > -softmmu_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss) > > -specific_scsi_ss = ss.source_set() > - > -virtio_scsi_ss = ss.source_set() > virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) > - > virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI_COMMON', if_true: files('vhost-scsi-common.c')) > virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi.c')) > virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi.c')) > +specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c')) > specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) I think it might still make sense to keep the virtio stuff together, i.e. add the SPAPR line after the VIRTIO_SCSI line instead of adding it in front of it? Thomas > -specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c')) > - > +softmmu_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss) > specific_ss.add_all(when: 'CONFIG_SCSI', if_true: specific_scsi_ss)
On 24/5/23 09:14, Thomas Huth wrote: > On 23/05/2023 18.35, Philippe Mathieu-Daudé wrote: >> We will modify this file shortly. Re-arrange it slightly first, >> declaring source sets first. >> >> No logical change. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> --- >> hw/scsi/meson.build | 12 +++++------- >> 1 file changed, 5 insertions(+), 7 deletions(-) >> >> diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build >> index fa9198e69f..f3206a4756 100644 >> --- a/hw/scsi/meson.build >> +++ b/hw/scsi/meson.build >> @@ -1,4 +1,7 @@ >> scsi_ss = ss.source_set() >> +specific_scsi_ss = ss.source_set() >> +virtio_scsi_ss = ss.source_set() >> + >> scsi_ss.add(files( >> 'emulation.c', >> 'scsi-bus.c', >> @@ -11,18 +14,13 @@ scsi_ss.add(when: 'CONFIG_LSI_SCSI_PCI', if_true: >> files('lsi53c895a.c')) >> scsi_ss.add(when: 'CONFIG_MEGASAS_SCSI_PCI', if_true: >> files('megasas.c')) >> scsi_ss.add(when: 'CONFIG_MPTSAS_SCSI_PCI', if_true: >> files('mptsas.c', 'mptconfig.c', 'mptendian.c')) >> scsi_ss.add(when: 'CONFIG_VMW_PVSCSI_SCSI_PCI', if_true: >> files('vmw_pvscsi.c')) >> -softmmu_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss) >> -specific_scsi_ss = ss.source_set() >> - >> -virtio_scsi_ss = ss.source_set() >> virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) >> - >> virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI_COMMON', if_true: >> files('vhost-scsi-common.c')) >> virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: >> files('vhost-scsi.c')) >> virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: >> files('vhost-user-scsi.c')) >> +specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: >> files('spapr_vscsi.c')) >> specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: >> virtio_scsi_ss) > > I think it might still make sense to keep the virtio stuff together, > i.e. add the SPAPR line after the VIRTIO_SCSI line instead of adding it > in front of it? OK will do.
diff --git a/hw/scsi/meson.build b/hw/scsi/meson.build index fa9198e69f..f3206a4756 100644 --- a/hw/scsi/meson.build +++ b/hw/scsi/meson.build @@ -1,4 +1,7 @@ scsi_ss = ss.source_set() +specific_scsi_ss = ss.source_set() +virtio_scsi_ss = ss.source_set() + scsi_ss.add(files( 'emulation.c', 'scsi-bus.c', @@ -11,18 +14,13 @@ scsi_ss.add(when: 'CONFIG_LSI_SCSI_PCI', if_true: files('lsi53c895a.c')) scsi_ss.add(when: 'CONFIG_MEGASAS_SCSI_PCI', if_true: files('megasas.c')) scsi_ss.add(when: 'CONFIG_MPTSAS_SCSI_PCI', if_true: files('mptsas.c', 'mptconfig.c', 'mptendian.c')) scsi_ss.add(when: 'CONFIG_VMW_PVSCSI_SCSI_PCI', if_true: files('vmw_pvscsi.c')) -softmmu_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss) -specific_scsi_ss = ss.source_set() - -virtio_scsi_ss = ss.source_set() virtio_scsi_ss.add(files('virtio-scsi.c', 'virtio-scsi-dataplane.c')) - virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI_COMMON', if_true: files('vhost-scsi-common.c')) virtio_scsi_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi.c')) virtio_scsi_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi.c')) +specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c')) specific_scsi_ss.add_all(when: 'CONFIG_VIRTIO_SCSI', if_true: virtio_scsi_ss) -specific_scsi_ss.add(when: 'CONFIG_SPAPR_VSCSI', if_true: files('spapr_vscsi.c')) - +softmmu_ss.add_all(when: 'CONFIG_SCSI', if_true: scsi_ss) specific_ss.add_all(when: 'CONFIG_SCSI', if_true: specific_scsi_ss)
We will modify this file shortly. Re-arrange it slightly first, declaring source sets first. No logical change. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/scsi/meson.build | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)