[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/13] hw/virtio/meson: Rename softmmu_virtio_ss -> system_virtio
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 10/13] hw/virtio/meson: Rename softmmu_virtio_ss -> system_virtio_ss |
Date: |
Wed, 4 Oct 2023 11:06:25 +0200 |
See commit de6cd7599b ("meson: Replace softmmu_ss -> system_ss")
for rationale.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
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 13e7c6c272..aad506fe52 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
- [PATCH 01/13] softmmu/trace-events: Fix a typo, (continued)
- [PATCH 01/13] softmmu/trace-events: Fix a typo, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 02/13] travis-ci: Correct invalid mentions of 'softmmu' by 'system', Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 04/13] fuzz: Correct invalid mentions of 'softmmu' by 'system', Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 05/13] tcg: Correct invalid mentions of 'softmmu' by 'system-mode', Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 03/13] cpu: Correct invalid mentions of 'softmmu' by 'system-mode', Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 06/13] accel: Rename accel_softmmu* -> accel_system*, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 07/13] gdbstub: Rename 'softmmu' -> 'system', Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 08/13] semihosting: Rename softmmu_FOO_user() -> uaccess_FOO_user(), Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 10/13] hw/virtio/meson: Rename softmmu_virtio_ss -> system_virtio_ss,
Philippe Mathieu-Daudé <=
- [PATCH 11/13] meson: Rename softmmu_mods -> system_mods, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 09/13] target/i386: Rename i386_softmmu_kvm_ss -> i386_kvm_ss, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 12/13] meson: Rename target_softmmu_arch -> target_system_arch, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 13/13] system: Rename softmmu/ directory as system/, Philippe Mathieu-Daudé, 2023/10/04
- Re: [PATCH 00/13] misc: Rename 'softmmu' -> 'system', Daniel P . Berrangé, 2023/10/04