qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Stefano Garzarella" <sgarzare@redhat.com>
Subject: [PULL v2 07/53] hw/virtio/meson: Rename softmmu_virtio_ss[] -> system_virtio_ss[]
Date: Wed, 4 Oct 2023 23:42:47 -0400	[thread overview]
Message-ID: <f05356f84d2e3cb4f6437716cc9b5dc59baf769d.1696477105.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1696477105.git.mst@redhat.com>

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Similarly to commit de6cd7599b ("meson: Replace softmmu_ss
-> system_ss"), rename the virtio source set common to all
system emulation as 'system_virtio_ss[]'. This is clearer
because softmmu can be used for user emulation.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230710100510.84862-1-philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/virtio/meson.build | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
index 9737450afd..4e81d10834 100644
--- a/hw/virtio/meson.build
+++ b/hw/virtio/meson.build
@@ -1,28 +1,28 @@
-softmmu_virtio_ss = ss.source_set()
-softmmu_virtio_ss.add(files('virtio-bus.c'))
-softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('virtio-pci.c'))
-softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_MMIO', if_true: files('virtio-mmio.c'))
-softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-crypto.c'))
-softmmu_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK_COMMON', if_true: files('vhost-vsock-common.c'))
-softmmu_virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c'))
-softmmu_virtio_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev.c'))
+system_virtio_ss = ss.source_set()
+system_virtio_ss.add(files('virtio-bus.c'))
+system_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('virtio-pci.c'))
+system_virtio_ss.add(when: 'CONFIG_VIRTIO_MMIO', if_true: files('virtio-mmio.c'))
+system_virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-crypto.c'))
+system_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK_COMMON', if_true: files('vhost-vsock-common.c'))
+system_virtio_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iommu.c'))
+system_virtio_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev.c'))
 
 specific_virtio_ss = ss.source_set()
 specific_virtio_ss.add(files('virtio.c'))
 specific_virtio_ss.add(files('virtio-config-io.c', 'virtio-qmp.c'))
 
 if have_vhost
-  softmmu_virtio_ss.add(files('vhost.c'))
+  system_virtio_ss.add(files('vhost.c'))
   specific_virtio_ss.add(files('vhost-backend.c', 'vhost-iova-tree.c'))
   if have_vhost_user
     specific_virtio_ss.add(files('vhost-user.c'))
   endif
   if have_vhost_vdpa
-    softmmu_virtio_ss.add(files('vhost-vdpa.c'))
+    system_virtio_ss.add(files('vhost-vdpa.c'))
     specific_virtio_ss.add(files('vhost-shadow-virtqueue.c'))
   endif
 else
-  softmmu_virtio_ss.add(files('vhost-stub.c'))
+  system_virtio_ss.add(files('vhost-stub.c'))
 endif
 
 specific_virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon.c'))
@@ -68,7 +68,7 @@ virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MD', if_true: files('virtio-md-pci.c'))
 
 specific_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss)
 
-system_ss.add_all(when: 'CONFIG_VIRTIO', if_true: softmmu_virtio_ss)
+system_ss.add_all(when: 'CONFIG_VIRTIO', if_true: system_virtio_ss)
 system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c'))
 system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('virtio-stub.c'))
 system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c'))
-- 
MST



  parent reply	other threads:[~2023-10-05  3:44 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-05  3:42 [PULL v2 00/53] virtio,pci: features, cleanups Michael S. Tsirkin
2023-10-05  3:42 ` [PULL v2 01/53] pci: SLT must be RO Michael S. Tsirkin
2023-10-05  3:42 ` [PULL v2 02/53] hw/virtio: Propagate page_mask to vhost_vdpa_listener_skipped_section() Michael S. Tsirkin
2023-10-05  3:42 ` [PULL v2 03/53] hw/virtio: Propagate page_mask to vhost_vdpa_section_end() Michael S. Tsirkin
2023-10-05  3:42 ` [PULL v2 04/53] hw/virtio/vhost-vdpa: Inline TARGET_PAGE_ALIGN() macro Michael S. Tsirkin
2023-10-05  3:42 ` [PULL v2 05/53] hw/virtio/vhost-vdpa: Use target-agnostic qemu_target_page_mask() Michael S. Tsirkin
2023-10-05  3:42 ` [PULL v2 06/53] hw/virtio: Build vhost-vdpa.o once Michael S. Tsirkin
2023-10-05  3:42 ` Michael S. Tsirkin [this message]
2023-10-05  3:42 ` [PULL v2 08/53] virtio: add vhost-user-base and a generic vhost-user-device Michael S. Tsirkin
2023-10-05  3:42 ` [PULL v2 09/53] hw/virtio: add config support to vhost-user-device Michael S. Tsirkin
2023-10-05  3:42 ` [PULL v2 10/53] virtio-net: do not reset vlan filtering at set_features Michael S. Tsirkin
2023-10-05  3:43 ` [PULL v2 11/53] virtio-net: Expose MAX_VLAN Michael S. Tsirkin
2023-10-05  3:43 ` [PULL v2 12/53] vdpa: Restore vlan filtering state Michael S. Tsirkin
2023-10-05  3:43 ` [PULL v2 13/53] vdpa: Allow VIRTIO_NET_F_CTRL_VLAN in SVQ Michael S. Tsirkin
2023-10-05  3:43 ` [PULL v2 14/53] virtio: don't zero out memory region cache for indirect descriptors Michael S. Tsirkin
2023-10-05  3:43 ` [PULL v2 15/53] vdpa: use first queue SVQ state for CVQ default Michael S. Tsirkin
2023-10-05  3:43 ` [PULL v2 16/53] vdpa: export vhost_vdpa_set_vring_ready Michael S. Tsirkin
2023-10-05  3:43 ` [PULL v2 17/53] vdpa: rename vhost_vdpa_net_load to vhost_vdpa_net_cvq_load Michael S. Tsirkin
2023-10-05  3:43 ` [PULL v2 18/53] vdpa: move vhost_vdpa_set_vring_ready to the caller Michael S. Tsirkin
2023-10-05  3:43 ` [PULL v2 19/53] vdpa: remove net cvq migration blocker Michael S. Tsirkin
2023-10-05  3:43 ` [PULL v2 20/53] vhost: Add count argument to vhost_svq_poll() Michael S. Tsirkin
2023-10-05  3:43 ` [PULL v2 21/53] qmp: remove virtio_list, search QOM tree instead Michael S. Tsirkin
2023-10-05  3:43 ` [PULL v2 22/53] qmp: update virtio feature maps, vhost-user-gpio introspection Michael S. Tsirkin
2023-10-05  3:43 ` [PULL v2 23/53] vhost-user: move VhostUserProtocolFeature definition to header file Michael S. Tsirkin
2023-10-05  3:44 ` [PULL v2 24/53] hw/isa/ich9: Add comment on imperfect emulation of PIC vs. I/O APIC routing Michael S. Tsirkin
2023-10-05  3:44 ` [PULL v2 25/53] hw/i386/acpi-build: Use pc_madt_cpu_entry() directly Michael S. Tsirkin
2023-10-05  3:44 ` [PULL v2 26/53] hw/acpi/cpu: Have build_cpus_aml() take a build_madt_cpu_fn callback Michael S. Tsirkin
2023-10-05  3:44 ` [PULL v2 27/53] hw/acpi/acpi_dev_interface: Remove now unused madt_cpu virtual method Michael S. Tsirkin
2023-10-05  3:44 ` [PULL v2 28/53] hw/acpi/acpi_dev_interface: Remove now unused #include "hw/boards.h" Michael S. Tsirkin
2023-10-05  3:44 ` [PULL v2 29/53] hw/i386: Remove now redundant TYPE_ACPI_GED_X86 Michael S. Tsirkin
2023-10-18 17:38   ` Salil Mehta
2023-10-19 10:33     ` Bernhard Beschow
2023-10-19 18:15       ` Michael S. Tsirkin
2023-10-20 23:54       ` Salil Mehta
2023-10-27 11:22         ` Igor Mammedov
2023-10-27 11:50     ` Igor Mammedov
2023-10-05  3:44 ` [PULL v2 30/53] hw/i386/acpi-build: Determine SMI command port just once Michael S. Tsirkin
2023-10-05  3:44 ` [PULL v2 31/53] hw/acpi: Trace GPE access in all device models, not just PIIX4 Michael S. Tsirkin
2023-10-05  3:44 ` [PULL v2 32/53] hw/acpi/core: Trace enable and status registers of GPE separately Michael S. Tsirkin
2023-10-05  3:44 ` [PULL v2 33/53] vdpa: fix gcc cvq_isolated uninitialized variable warning Michael S. Tsirkin
2023-10-05  3:44 ` [PULL v2 34/53] vdpa net: zero vhost_vdpa iova_tree pointer at cleanup Michael S. Tsirkin
2023-10-05  3:44 ` [PULL v2 35/53] hw/cxl: Push cxl_decoder_count_enc() and cxl_decode_ig() into .c Michael S. Tsirkin
2023-10-05  3:44 ` [PULL v2 36/53] hw/cxl: Add utility functions decoder interleave ways and target count Michael S. Tsirkin
2023-10-05  3:44 ` [PULL v2 37/53] hw/cxl: Fix and use same calculation for HDM decoder block size everywhere Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 38/53] hw/cxl: Support 4 HDM decoders at all levels of topology Michael S. Tsirkin
2023-10-19 12:31   ` Peter Maydell
2023-10-19 14:04     ` Jonathan Cameron via
2023-10-19 14:04       ` Jonathan Cameron
2023-10-05  3:45 ` [PULL v2 39/53] hw/pci-bridge/cxl-upstream: Add serial number extended capability support Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 40/53] vdpa net: fix error message setting virtio status Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 41/53] vdpa net: stop probing if cannot set features Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 42/53] vdpa net: follow VirtIO initialization properly at cvq isolation probing Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 43/53] amd_iommu: Fix APIC address check Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 44/53] hw/i386/pc: improve physical address space bound check for 32-bit x86 systems Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 45/53] pcie_sriov: unregister_vfs(): fix error path Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 46/53] libvhost-user.c: add assertion to vu_message_read_default Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 47/53] virtio: use shadow_avail_idx while checking number of heads Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 48/53] virtio: remove unnecessary thread fence while reading next descriptor Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 49/53] virtio: remove unused next argument from virtqueue_split_read_next_desc() Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 50/53] util/uuid: add a hash function Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 51/53] hw/display: introduce virtio-dmabuf Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 52/53] vhost-user: add shared_object msg Michael S. Tsirkin
2023-10-05  3:45 ` [PULL v2 53/53] libvhost-user: handle " Michael S. Tsirkin
2023-10-05 15:56 ` [PULL v2 00/53] virtio,pci: features, cleanups Stefan Hajnoczi

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=f05356f84d2e3cb4f6437716cc9b5dc59baf769d.1696477105.git.mst@redhat.com \
    --to=mst@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=sgarzare@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).