From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Raphael Norwitz" <raphael.norwitz@nutanix.com>,
"Peter Xu" <peterx@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Thomas Huth" <thuth@redhat.com>,
"Gonglei (Arei)" <arei.gonglei@huawei.com>,
"David Hildenbrand" <david@redhat.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>,
qemu-block@nongnu.org, "Eric Farman" <farman@linux.ibm.com>,
"Fam Zheng" <fam@euphon.net>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Cornelia Huck" <cohuck@redhat.com>,
"Eric Auger" <eric.auger@redhat.com>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
qemu-s390x@nongnu.org
Subject: [PATCH 03/11] hw/scsi: Rearrange meson.build
Date: Tue, 23 May 2023 18:35:52 +0200 [thread overview]
Message-ID: <20230523163600.83391-4-philmd@linaro.org> (raw)
In-Reply-To: <20230523163600.83391-1-philmd@linaro.org>
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)
-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)
--
2.38.1
next prev parent reply other threads:[~2023-05-23 16:38 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 16:35 [PATCH 00/11] hw/virtio: Build various target-agnostic objects just once Philippe Mathieu-Daudé
2023-05-23 16:35 ` [PATCH 01/11] softmmu: Introduce qemu_target_page_mask/qemu_target_page_align helpers Philippe Mathieu-Daudé
2023-05-23 18:17 ` Thomas Huth
2023-05-23 23:08 ` Richard Henderson
2023-05-23 16:35 ` [PATCH 02/11] hw/scsi: Introduce VHOST_SCSI_COMMON symbol in Kconfig Philippe Mathieu-Daudé
2023-05-23 18:18 ` Thomas Huth
2023-05-23 23:13 ` Richard Henderson
2023-05-23 16:35 ` Philippe Mathieu-Daudé [this message]
2023-05-23 23:14 ` [PATCH 03/11] hw/scsi: Rearrange meson.build Richard Henderson
2023-05-24 7:14 ` Thomas Huth
2023-05-24 9:33 ` Philippe Mathieu-Daudé
2023-05-23 16:35 ` [PATCH 04/11] hw/scsi: Rename target-specific source set as 'specific_virtio_scsi_ss' Philippe Mathieu-Daudé
2023-05-23 23:15 ` Richard Henderson
2023-05-23 16:35 ` [PATCH 05/11] hw/virtio: Introduce VHOST_VSOCK_COMMON symbol in Kconfig Philippe Mathieu-Daudé
2023-05-23 23:23 ` Richard Henderson
2023-05-24 7:15 ` Thomas Huth
2023-05-23 16:35 ` [PATCH 06/11] hw/virtio/virtio-mem: Use qemu_ram_get_fd() helper Philippe Mathieu-Daudé
2023-05-23 17:28 ` David Hildenbrand
2023-05-23 23:24 ` Richard Henderson
2023-05-23 16:35 ` [PATCH 07/11] hw/virtio/vhost-vsock: Include missing 'virtio/virtio-bus.h' header Philippe Mathieu-Daudé
2023-05-23 23:24 ` Richard Henderson
2023-05-24 7:17 ` Thomas Huth
2023-05-23 16:35 ` [PATCH 08/11] hw/virtio/virtio-iommu: Use target-agnostic qemu_target_page_mask() Philippe Mathieu-Daudé
2023-05-23 23:28 ` Richard Henderson
2023-05-24 9:27 ` Philippe Mathieu-Daudé
2023-05-24 7:18 ` Thomas Huth
2023-05-24 7:35 ` Eric Auger
2023-05-23 16:35 ` [PATCH 09/11] hw/virtio: Remove unnecessary 'virtio-access.h' header Philippe Mathieu-Daudé
2023-05-23 23:29 ` Richard Henderson
2023-05-24 7:29 ` Thomas Huth
2023-05-24 7:38 ` Philippe Mathieu-Daudé
2023-05-23 16:35 ` [PATCH 10/11] hw/virtio: Build various target-agnostic objects just once Philippe Mathieu-Daudé
2023-05-23 23:31 ` Richard Henderson
2023-05-24 7:32 ` Thomas Huth
2023-05-23 16:36 ` [RFC PATCH 11/11] hw/virtio: Make vhost-vdpa.c target-agnostic to build it once Philippe Mathieu-Daudé
2023-05-23 23:43 ` Richard Henderson
2023-05-24 7:34 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230523163600.83391-4-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=arei.gonglei@huawei.com \
--cc=borntraeger@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=eric.auger@redhat.com \
--cc=fam@euphon.net \
--cc=farman@linux.ibm.com \
--cc=hreitz@redhat.com \
--cc=iii@linux.ibm.com \
--cc=kwolf@redhat.com \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=raphael.norwitz@nutanix.com \
--cc=richard.henderson@linaro.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.