mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
meson: convert hw/core
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
582ea95f5f
commit
c92a309777
|
@ -1,4 +1,3 @@
|
|||
devices-dirs-y = core/
|
||||
ifeq ($(CONFIG_SOFTMMU), y)
|
||||
devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/
|
||||
devices-dirs-y += acpi/
|
||||
|
|
|
@ -1,34 +0,0 @@
|
|||
# core qdev-related obj files, also used by *-user:
|
||||
common-obj-y += qdev.o qdev-properties.o
|
||||
common-obj-y += bus.o
|
||||
common-obj-y += cpu.o
|
||||
common-obj-y += resettable.o
|
||||
common-obj-y += hotplug.o
|
||||
common-obj-y += vmstate-if.o
|
||||
# irq.o needed for qdev GPIO handling:
|
||||
common-obj-y += irq.o
|
||||
common-obj-y += clock.o qdev-clock.o
|
||||
|
||||
common-obj-$(CONFIG_SOFTMMU) += reset.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += qdev-fw.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += fw-path-provider.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += nmi.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += sysbus.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += machine.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += null-machine.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += loader.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += numa.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += clock-vmstate.o
|
||||
obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o
|
||||
|
||||
common-obj-$(CONFIG_XILINX_AXI) += stream.o
|
||||
common-obj-$(CONFIG_PTIMER) += ptimer.o
|
||||
common-obj-$(CONFIG_FITLOADER) += loader-fit.o
|
||||
common-obj-$(CONFIG_REGISTER) += register.o
|
||||
common-obj-$(CONFIG_OR_IRQ) += or-irq.o
|
||||
common-obj-$(CONFIG_SPLIT_IRQ) += split-irq.o
|
||||
common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
|
||||
common-obj-$(CONFIG_GENERIC_LOADER) += generic-loader.o
|
49
hw/core/meson.build
Normal file
49
hw/core/meson.build
Normal file
|
@ -0,0 +1,49 @@
|
|||
# core qdev-related obj files, also used by *-user and unit tests
|
||||
hwcore_files = files(
|
||||
'bus.c',
|
||||
'fw-path-provider.c',
|
||||
'hotplug.c',
|
||||
'qdev-properties.c',
|
||||
'qdev.c',
|
||||
'reset.c',
|
||||
'resettable.c',
|
||||
'vmstate-if.c',
|
||||
# irq.c needed for qdev GPIO handling:
|
||||
'irq.c',
|
||||
'clock.c',
|
||||
'qdev-clock.c',
|
||||
)
|
||||
|
||||
libhwcore = static_library('hwcore', sources: hwcore_files + genh,
|
||||
name_suffix: 'fa',
|
||||
build_by_default: false)
|
||||
hwcore = declare_dependency(link_whole: libhwcore)
|
||||
common_ss.add(hwcore)
|
||||
|
||||
common_ss.add(files('cpu.c'))
|
||||
common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c'))
|
||||
common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c'))
|
||||
common_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c'))
|
||||
common_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c'))
|
||||
common_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c'))
|
||||
common_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c'))
|
||||
common_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c'))
|
||||
common_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
|
||||
|
||||
softmmu_ss.add(files(
|
||||
'loader.c',
|
||||
'machine-hmp-cmds.c',
|
||||
'machine.c',
|
||||
'nmi.c',
|
||||
'null-machine.c',
|
||||
'qdev-fw.c',
|
||||
'qdev-properties-system.c',
|
||||
'sysbus.c',
|
||||
'vm-change-state-handler.c',
|
||||
'clock-vmstate.c',
|
||||
))
|
||||
|
||||
specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files(
|
||||
'machine-qmp-cmds.c',
|
||||
'numa.c',
|
||||
))
|
|
@ -1 +1,2 @@
|
|||
subdir('core')
|
||||
subdir('xen')
|
||||
|
|
|
@ -244,15 +244,7 @@ tests/test-bufferiszero$(EXESUF): tests/test-bufferiszero.o $(test-util-obj-y)
|
|||
tests/atomic_add-bench$(EXESUF): tests/atomic_add-bench.o $(test-util-obj-y)
|
||||
tests/atomic64-bench$(EXESUF): tests/atomic64-bench.o $(test-util-obj-y)
|
||||
|
||||
tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \
|
||||
hw/core/qdev.o hw/core/qdev-properties.o hw/core/hotplug.o\
|
||||
hw/core/bus.o \
|
||||
hw/core/resettable.o \
|
||||
hw/core/irq.o \
|
||||
hw/core/fw-path-provider.o \
|
||||
hw/core/reset.o \
|
||||
hw/core/vmstate-if.o \
|
||||
hw/core/clock.o hw/core/qdev-clock.o \
|
||||
tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o hw/core/libhwcore.fa \
|
||||
$(test-qapi-obj-y)
|
||||
tests/test-vmstate$(EXESUF): tests/test-vmstate.o migration/libmigration.fa \
|
||||
$(test-io-obj-y)
|
||||
|
|
Loading…
Reference in a new issue