[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v8 086/152] meson: convert hw/xen
From: |
Paolo Bonzini |
Subject: |
[PULL v8 086/152] meson: convert hw/xen |
Date: |
Fri, 21 Aug 2020 06:22:23 -0400 |
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>
---
configure | 7 +++++--
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/xen/Makefile.objs | 7 -------
hw/xen/meson.build | 20 ++++++++++++++++++++
meson.build | 6 ++++++
6 files changed, 32 insertions(+), 10 deletions(-)
create mode 100644 hw/meson.build
delete mode 100644 hw/xen/Makefile.objs
create mode 100644 hw/xen/meson.build
diff --git a/configure b/configure
index 3018da6336..f84dcac468 100755
--- a/configure
+++ b/configure
@@ -2736,6 +2736,8 @@ if test "$xen" != "no" ; then
fi
QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags $xen_pc)"
libs_softmmu="$($pkg_config --libs $xen_pc) $libs_softmmu"
+ xen_cflags="$($pkg_config --cflags $xen_pc)"
+ xen_libs="$($pkg_config --libs $xen_pc)"
else
xen_libs="-lxenstore -lxenctrl -lxenguest"
@@ -3016,9 +3018,8 @@ EOF
if test "$xen" = yes; then
if test $xen_ctrl_version -ge 40701 ; then
- libs_softmmu="$xen_stable_libs $libs_softmmu"
+ xen_libs="$xen_libs $xen_stable_libs "
fi
- libs_softmmu="$xen_libs $libs_softmmu"
fi
fi
fi
@@ -7309,6 +7310,8 @@ fi
if test "$xen" = "yes" ; then
echo "CONFIG_XEN_BACKEND=y" >> $config_host_mak
echo "CONFIG_XEN_CTRL_INTERFACE_VERSION=$xen_ctrl_version" >>
$config_host_mak
+ echo "XEN_CFLAGS=$xen_cflags" >> $config_host_mak
+ echo "XEN_LIBS=$xen_libs" >> $config_host_mak
fi
if test "$linux_aio" = "yes" ; then
echo "CONFIG_LINUX_AIO=y" >> $config_host_mak
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 14b7ea4eb6..d204a906af 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -35,7 +35,6 @@ devices-dirs-y += usb/
devices-dirs-$(CONFIG_VFIO) += vfio/
devices-dirs-y += virtio/
devices-dirs-y += watchdog/
-devices-dirs-$(CONFIG_XEN) += xen/
devices-dirs-$(CONFIG_MEM_DEVICE) += mem/
devices-dirs-$(CONFIG_NUBUS) += nubus/
devices-dirs-y += semihosting/
diff --git a/hw/meson.build b/hw/meson.build
new file mode 100644
index 0000000000..08112a5e4b
--- /dev/null
+++ b/hw/meson.build
@@ -0,0 +1 @@
+subdir('xen')
diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs
deleted file mode 100644
index 502b32d877..0000000000
--- a/hw/xen/Makefile.objs
+++ /dev/null
@@ -1,7 +0,0 @@
-# xen backend driver support
-common-obj-y += xen-legacy-backend.o xen_devconfig.o xen_pvdev.o xen-bus.o
xen-bus-helper.o xen-backend.o
-
-obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o
-obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o
xen_pt_graphics.o xen_pt_msi.o
-obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt_load_rom.o
-obj-$(call lnot,$(CONFIG_XEN_PCI_PASSTHROUGH)) += xen_pt_stub.o
diff --git a/hw/xen/meson.build b/hw/xen/meson.build
new file mode 100644
index 0000000000..076954b89c
--- /dev/null
+++ b/hw/xen/meson.build
@@ -0,0 +1,20 @@
+softmmu_ss.add(when: ['CONFIG_XEN', xen], if_true: files(
+ 'xen-backend.c',
+ 'xen-bus-helper.c',
+ 'xen-bus.c',
+ 'xen-legacy-backend.c',
+ 'xen_devconfig.c',
+ 'xen_pvdev.c',
+))
+
+xen_specific_ss = ss.source_set()
+xen_specific_ss.add(when: 'CONFIG_XEN_PCI_PASSTHROUGH', if_true: files(
+ 'xen-host-pci-device.c',
+ 'xen_pt.c',
+ 'xen_pt_config_init.c',
+ 'xen_pt_graphics.c',
+ 'xen_pt_load_rom.c',
+ 'xen_pt_msi.c',
+), if_false: files('xen_pt_stub.c'))
+
+specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss)
diff --git a/meson.build b/meson.build
index edb635347c..aa715e5428 100644
--- a/meson.build
+++ b/meson.build
@@ -325,6 +325,11 @@ numa = not_found
if 'CONFIG_NUMA' in config_host
numa = declare_dependency(link_args: config_host['NUMA_LIBS'].split())
endif
+xen = not_found
+if 'CONFIG_XEN_BACKEND' in config_host
+ xen = declare_dependency(compile_args: config_host['XEN_CFLAGS'].split(),
+ link_args: config_host['XEN_LIBS'].split())
+endif
create_config = find_program('scripts/create_config')
minikconf = find_program('scripts/minikconf.py')
@@ -678,6 +683,7 @@ subdir('migration')
subdir('monitor')
subdir('net')
subdir('replay')
+subdir('hw')
# needed for fuzzing binaries
subdir('tests/qtest/libqos')
--
2.26.2
- [PULL v8 070/152] meson: convert tests/qtest to meson, (continued)
- [PULL v8 070/152] meson: convert tests/qtest to meson, Paolo Bonzini, 2020/08/21
- [PULL v8 082/152] meson: convert backends directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 081/152] meson: convert net directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 077/152] meson: convert common QMP bits for qemu and qemu-storage-daemon, Paolo Bonzini, 2020/08/21
- [PULL v8 072/152] meson: convert ui directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 085/152] meson: convert qapi-specific to meson, Paolo Bonzini, 2020/08/21
- [PULL v8 084/152] meson: convert disas directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 089/152] meson: convert hw/nubus, Paolo Bonzini, 2020/08/21
- [PULL v8 087/152] meson: convert hw/core, Paolo Bonzini, 2020/08/21
- [PULL v8 083/152] meson: convert fsdev/, Paolo Bonzini, 2020/08/21
- [PULL v8 086/152] meson: convert hw/xen,
Paolo Bonzini <=
- [PULL v8 090/152] meson: convert hw/smbios, Paolo Bonzini, 2020/08/21
- [PULL v8 091/152] meson: convert hw/mem, Paolo Bonzini, 2020/08/21
- [PULL v8 093/152] meson: convert hw/virtio, Paolo Bonzini, 2020/08/21
- [PULL v8 096/152] meson: convert hw/tpm, Paolo Bonzini, 2020/08/21
- [PULL v8 098/152] meson: convert hw/rtc, Paolo Bonzini, 2020/08/21
- [PULL v8 094/152] meson: convert hw/vfio, Paolo Bonzini, 2020/08/21
- [PULL v8 097/152] meson: convert hw/timer, Paolo Bonzini, 2020/08/21
- [PULL v8 095/152] meson: convert hw/usb, Paolo Bonzini, 2020/08/21
- [PULL v8 100/152] meson: convert hw/sd, Paolo Bonzini, 2020/08/21
- [PULL v8 088/152] meson: convert hw/semihosting, Paolo Bonzini, 2020/08/21