summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lureau2019-08-16 17:02:41 +0200
committerPaolo Bonzini2020-08-21 12:30:31 +0200
commitcc4d76a3ed2937900038ea0223fc182b945103bc (patch)
treef5760f55ee87c71c7fecc62c0041365ca0f81241
parentmeson: convert hw/i2c (diff)
downloadqemu-cc4d76a3ed2937900038ea0223fc182b945103bc.tar.gz
qemu-cc4d76a3ed2937900038ea0223fc182b945103bc.tar.xz
qemu-cc4d76a3ed2937900038ea0223fc182b945103bc.zip
meson: convert hw/hyperv
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/Makefile.objs1
-rw-r--r--hw/hyperv/Makefile.objs3
-rw-r--r--hw/hyperv/meson.build3
-rw-r--r--hw/meson.build1
4 files changed, 4 insertions, 4 deletions
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')