diff options
| -rw-r--r-- | hw/virtio/meson.build | 4 | ||||
| -rw-r--r-- | tests/tcg/Makefile.target | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 6047670804..67dc77e00f 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -11,9 +11,9 @@ softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c')) virtio_ss = ss.source_set() virtio_ss.add(files('virtio.c')) -virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backend.c', 'vhost-shadow-virtqueue.c', 'vhost-iova-tree.c')) +virtio_ss.add(when: 'CONFIG_VHOST', if_true: files('vhost.c', 'vhost-backend.c', 'vhost-iova-tree.c')) virtio_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user.c')) -virtio_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-vdpa.c')) +virtio_ss.add(when: 'CONFIG_VHOST_VDPA', if_true: files('vhost-shadow-virtqueue.c', 'vhost-vdpa.c')) virtio_ss.add(when: 'CONFIG_VIRTIO_BALLOON', if_true: files('virtio-balloon.c')) virtio_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('virtio-crypto.c')) virtio_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VIRTIO_PCI'], if_true: files('virtio-crypto-pci.c')) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index ae8004c76e..acda5bcec2 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -32,8 +32,10 @@ all: -include ../../../config-host.mak -include ../config-$(TARGET).mak + +# Get semihosting definitions for user-mode emulation ifeq ($(CONFIG_USER_ONLY),y) --include $(SRC_PATH)/configs/targets/$(TARGET)/default.mak +-include $(SRC_PATH)/configs/targets/$(TARGET).mak endif # for including , in command strings |