From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 14/26] hw/virtio/meson: Rename softmmu_virtio_ss -> system_virtio_ss
Date: Fri, 6 Oct 2023 13:14:00 +0200 [thread overview]
Message-ID: <20231006111412.13130-15-pbonzini@redhat.com> (raw)
In-Reply-To: <20231006111412.13130-1-pbonzini@redhat.com>
From: Philippe Mathieu-Daudé <philmd@linaro.org>
See commit de6cd7599b ("meson: Replace softmmu_ss -> system_ss")
for rationale.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231004090629.37473-11-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/virtio/meson.build | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build
index 13e7c6c272b..aad506fe521 100644
--- a/hw/virtio/meson.build
+++ b/hw/virtio/meson.build
@@ -1,18 +1,18 @@
-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'))
@@ -21,7 +21,7 @@ if have_vhost
specific_virtio_ss.add(files('vhost-vdpa.c', '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'))
@@ -67,7 +67,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'))
--
2.41.0
next prev parent reply other threads:[~2023-10-06 11:17 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-06 11:13 [PULL 00/26] Audio, source reorg, HVF changes for 2023-10-06 Paolo Bonzini
2023-10-06 11:13 ` [PULL 01/26] target/i386/hvf: Remove unused includes in 'hvf-i386.h' Paolo Bonzini
2023-10-06 11:13 ` [PULL 02/26] sysemu/kvm: Restrict hvf_get_supported_cpuid() to x86 targets Paolo Bonzini
2023-10-06 11:13 ` [PULL 03/26] util/log: re-allow switching away from stderr log file Paolo Bonzini
2023-10-06 11:13 ` [PULL 04/26] target/i386: Check for USER_ONLY definition instead of SOFTMMU one Paolo Bonzini
2023-10-06 11:13 ` [PULL 05/26] softmmu/trace-events: Fix a typo Paolo Bonzini
2023-10-06 11:13 ` [PULL 06/26] travis-ci: Correct invalid mentions of 'softmmu' by 'system' Paolo Bonzini
2023-10-06 11:13 ` [PULL 07/26] cpu: Correct invalid mentions of 'softmmu' by 'system-mode' Paolo Bonzini
2023-10-06 11:13 ` [PULL 08/26] fuzz: Correct invalid mentions of 'softmmu' by 'system' Paolo Bonzini
2023-10-06 11:13 ` [PULL 09/26] tcg: Correct invalid mentions of 'softmmu' by 'system-mode' Paolo Bonzini
2023-10-06 11:13 ` [PULL 10/26] accel: Rename accel_softmmu* -> accel_system* Paolo Bonzini
2023-10-06 11:13 ` [PULL 11/26] gdbstub: Rename 'softmmu' -> 'system' Paolo Bonzini
2023-10-06 11:13 ` [PULL 12/26] semihosting: Rename softmmu_FOO_user() -> uaccess_FOO_user() Paolo Bonzini
2023-10-06 11:13 ` [PULL 13/26] target/i386: Rename i386_softmmu_kvm_ss -> i386_kvm_ss Paolo Bonzini
2023-10-06 11:14 ` Paolo Bonzini [this message]
2023-10-06 11:14 ` [PULL 15/26] meson: Rename softmmu_mods -> system_mods Paolo Bonzini
2023-10-06 11:14 ` [PULL 16/26] meson: Rename target_softmmu_arch -> target_system_arch Paolo Bonzini
2023-10-06 11:14 ` [PULL 17/26] system: Rename softmmu/ directory as system/ Paolo Bonzini
2023-10-06 11:14 ` [PULL 18/26] configure: change $softmmu to $system Paolo Bonzini
2023-10-06 11:14 ` [PULL 19/26] cutils: squelch compiler warnings with custom paths Paolo Bonzini
2023-10-06 11:14 ` [PULL 20/26] audio: error hints need a trailing \n Paolo Bonzini
2023-10-06 11:14 ` [PULL 21/26] audio: disable default backends if -audio/-audiodev is used Paolo Bonzini
2023-10-06 11:14 ` [PULL 22/26] audio: extract audio_define_default Paolo Bonzini
2023-10-06 11:14 ` [PULL 23/26] audio: extend -audio to allow creating a default backend Paolo Bonzini
2023-10-06 11:14 ` [PULL 24/26] audio: do not use first -audiodev as default audio device Paolo Bonzini
2023-10-06 11:14 ` [PULL 25/26] audio: reintroduce default audio backend for VNC Paolo Bonzini
2023-10-06 11:14 ` [PULL 26/26] audio, qtest: get rid of QEMU_AUDIO_DRV Paolo Bonzini
2023-10-08 6:13 ` [PULL 00/26] Audio, source reorg, HVF changes for 2023-10-06 Paolo Bonzini
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=20231006111412.13130-15-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).