[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 099/132] meson: convert hw/block
From: |
Paolo Bonzini |
Subject: |
[PATCH 099/132] meson: convert hw/block |
Date: |
Thu, 19 Dec 2019 13:23:19 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 1 -
hw/block/Makefile.objs | 17 -----------------
hw/block/dataplane/Makefile.objs | 2 --
hw/block/dataplane/meson.build | 2 ++
hw/block/meson.build | 20 ++++++++++++++++++++
hw/meson.build | 1 +
6 files changed, 23 insertions(+), 20 deletions(-)
delete mode 100644 hw/block/Makefile.objs
delete mode 100644 hw/block/dataplane/Makefile.objs
create mode 100644 hw/block/dataplane/meson.build
create mode 100644 hw/block/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 6ddffce..0c92a04 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -3,7 +3,6 @@ devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call
land,$(CONFIG_VIRTFS),$(CONFI
devices-dirs-y += acpi/
devices-dirs-y += adc/
devices-dirs-y += audio/
-devices-dirs-y += block/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs
deleted file mode 100644
index f5f643f..0000000
--- a/hw/block/Makefile.objs
+++ /dev/null
@@ -1,17 +0,0 @@
-common-obj-y += block.o cdrom.o hd-geometry.o
-common-obj-$(CONFIG_FDC) += fdc.o
-common-obj-$(CONFIG_SSI_M25P80) += m25p80.o
-common-obj-$(CONFIG_NAND) += nand.o
-common-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o
-common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o
-common-obj-$(CONFIG_XEN) += xen-block.o
-common-obj-$(CONFIG_ECC) += ecc.o
-common-obj-$(CONFIG_ONENAND) += onenand.o
-common-obj-$(CONFIG_NVME_PCI) += nvme.o
-
-obj-$(CONFIG_SH4) += tc58128.o
-
-obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o
-obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o
-
-obj-y += dataplane/
diff --git a/hw/block/dataplane/Makefile.objs b/hw/block/dataplane/Makefile.objs
deleted file mode 100644
index 0c52702..0000000
--- a/hw/block/dataplane/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o
-obj-$(CONFIG_XEN) += xen-block.o
diff --git a/hw/block/dataplane/meson.build b/hw/block/dataplane/meson.build
new file mode 100644
index 0000000..12c6a26
--- /dev/null
+++ b/hw/block/dataplane/meson.build
@@ -0,0 +1,2 @@
+specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
+specific_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c'))
diff --git a/hw/block/meson.build b/hw/block/meson.build
new file mode 100644
index 0000000..a435ab4
--- /dev/null
+++ b/hw/block/meson.build
@@ -0,0 +1,20 @@
+softmmu_ss.add(files(
+ 'block.c',
+ 'cdrom.c',
+ 'hd-geometry.c'
+))
+softmmu_ss.add(when: 'CONFIG_ECC', if_true: files('ecc.c'))
+softmmu_ss.add(when: 'CONFIG_FDC', if_true: files('fdc.c'))
+softmmu_ss.add(when: 'CONFIG_NAND', if_true: files('nand.c'))
+softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c'))
+softmmu_ss.add(when: 'CONFIG_ONENAND', if_true: files('onenand.c'))
+softmmu_ss.add(when: 'CONFIG_PFLASH_CFI01', if_true: files('pflash_cfi01.c'))
+softmmu_ss.add(when: 'CONFIG_PFLASH_CFI02', if_true: files('pflash_cfi02.c'))
+softmmu_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80.c'))
+softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c'))
+
+specific_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.c'))
+specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
+specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true:
files('vhost-user-blk.c'))
+
+subdir('dataplane')
diff --git a/hw/meson.build b/hw/meson.build
index 54414a6..a6782a5 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,3 +1,4 @@
+subdir('block')
subdir('bt')
subdir('char')
subdir('core')
--
1.8.3.1
- [PATCH 091/132] meson: convert hw/i2c, (continued)
- [PATCH 091/132] meson: convert hw/i2c, Paolo Bonzini, 2019/12/12
- [PATCH 093/132] meson: convert hw/gpio, Paolo Bonzini, 2019/12/12
- Re: [RFC PATCH v3 000/132] Proof of concept for Meson integration, Markus Armbruster, 2019/12/19
- [PATCH 092/132] meson: convert hw/hyperv, Paolo Bonzini, 2019/12/19
- [PATCH 094/132] meson: convert hw/dma, Paolo Bonzini, 2019/12/19
- [PATCH 093/132] meson: convert hw/gpio, Paolo Bonzini, 2019/12/19
- [PATCH 095/132] meson: convert hw/display, Paolo Bonzini, 2019/12/19
- [PATCH 096/132] meson: convert hw/cpu, Paolo Bonzini, 2019/12/19
- [PATCH 098/132] meson: convert hw/bt, Paolo Bonzini, 2019/12/19
- [PATCH 097/132] meson: convert hw/char, Paolo Bonzini, 2019/12/19
- [PATCH 099/132] meson: convert hw/block,
Paolo Bonzini <=
- [PATCH 100/132] meson: convert hw/audio, Paolo Bonzini, 2019/12/19
- [PATCH 101/132] meson: convert hw/adc, Paolo Bonzini, 2019/12/19
- [PATCH 102/132] meson: convert hw/acpi, Paolo Bonzini, 2019/12/19
- [PATCH 103/132] meson: convert hw/9pfs, Paolo Bonzini, 2019/12/19
- [PATCH 104/132] meson: convert target/s390x/gen-features.h, Paolo Bonzini, 2019/12/19
- [PATCH 107/132] meson: accel, Paolo Bonzini, 2019/12/19
- [PATCH 105/132] meson: convert hw/arch*, Paolo Bonzini, 2019/12/19
- [PATCH 109/132] meson: bsd-user, Paolo Bonzini, 2019/12/19
- [PATCH 106/132] meson: target, Paolo Bonzini, 2019/12/19
- [PATCH 110/132] meson: cpu-emu, Paolo Bonzini, 2019/12/19