[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 115/150] meson: convert hw/hyperv
From: |
Paolo Bonzini |
Subject: |
[PATCH 115/150] meson: convert hw/hyperv |
Date: |
Mon, 17 Aug 2020 16:40:18 +0200 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/hyperv/Makefile.objs | 3 ---
hw/hyperv/meson.build | 3 +++
hw/meson.build | 1 +
4 files changed, 4 insertions(+), 4 deletions(-)
delete mode 100644 hw/hyperv/Makefile.objs
create mode 100644 hw/hyperv/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 22eb804730..a2c2f6d1de 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -9,7 +9,6 @@ devices-dirs-y += cpu/
devices-dirs-y += display/
devices-dirs-y += dma/
devices-dirs-y += gpio/
-devices-dirs-$(CONFIG_HYPERV) += hyperv/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/hyperv/Makefile.objs b/hw/hyperv/Makefile.objs
deleted file mode 100644
index 5b614e040c..0000000000
--- a/hw/hyperv/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-obj-y += hyperv.o
-obj-$(CONFIG_HYPERV_TESTDEV) += hyperv_testdev.o
-obj-$(CONFIG_VMBUS) += vmbus.o
diff --git a/hw/hyperv/meson.build b/hw/hyperv/meson.build
new file mode 100644
index 0000000000..1367e2994f
--- /dev/null
+++ b/hw/hyperv/meson.build
@@ -0,0 +1,3 @@
+specific_ss.add(when: 'CONFIG_HYPERV', if_true: files('hyperv.c'))
+specific_ss.add(when: 'CONFIG_HYPERV_TESTDEV', if_true:
files('hyperv_testdev.c'))
+specific_ss.add(when: 'CONFIG_VMBUS', if_true: files('vmbus.c'))
diff --git a/hw/meson.build b/hw/meson.build
index 983edc1d47..f9e5adfb48 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('hyperv')
subdir('i2c')
subdir('ide')
subdir('input')
--
2.26.2
- [PATCH 106/150] meson: convert hw/net, (continued)
- [PATCH 106/150] meson: convert hw/net, Paolo Bonzini, 2020/08/17
- [PATCH 107/150] meson: convert hw/misc, Paolo Bonzini, 2020/08/17
- [PATCH 108/150] meson: convert hw/isa, Paolo Bonzini, 2020/08/17
- [PATCH 109/150] meson: convert hw/ipmi, Paolo Bonzini, 2020/08/17
- [PATCH 110/150] meson: convert hw/ipack, Paolo Bonzini, 2020/08/17
- [PATCH 111/150] meson: convert hw/intc, Paolo Bonzini, 2020/08/17
- [PATCH 112/150] meson: convert hw/input, Paolo Bonzini, 2020/08/17
- [PATCH 113/150] meson: convert hw/ide, Paolo Bonzini, 2020/08/17
- [PATCH 114/150] meson: convert hw/i2c, Paolo Bonzini, 2020/08/17
- [PATCH 115/150] meson: convert hw/hyperv,
Paolo Bonzini <=
- [PATCH 116/150] meson: convert hw/gpio, Paolo Bonzini, 2020/08/17
- [PATCH 117/150] meson: convert hw/dma, Paolo Bonzini, 2020/08/17
- [PATCH 118/150] meson: convert hw/display, Paolo Bonzini, 2020/08/17
- [PATCH 119/150] meson: convert hw/cpu, Paolo Bonzini, 2020/08/17
- [PATCH 120/150] meson: convert hw/char, Paolo Bonzini, 2020/08/17
- [PATCH 121/150] meson: convert hw/block, Paolo Bonzini, 2020/08/17
- [PATCH 122/150] meson: convert hw/audio, Paolo Bonzini, 2020/08/17
- [PATCH 123/150] meson: convert hw/adc, Paolo Bonzini, 2020/08/17