diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2022-03-29 22:20:20 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-03-29 22:20:20 +0100 |
| commit | aad3cc8626d1f5f911c06fb048e3fa748718551d (patch) | |
| tree | 093516165c149af88ff73ef1be16ddcf54de0224 | |
| parent | 68894b5fed671d49587209697f2224b4e857fd1a (diff) | |
| parent | 36e38426ff40c9ba86d4e66027f3a98747890623 (diff) | |
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging
Build bugfixes.
# gpg: Signature made Tue 29 Mar 2022 14:59:03 BST
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* tag 'for-upstream' of https://gitlab.com/bonzini/qemu:
tests/tcg: really fix path to target configuration
virtio: fix --enable-vhost-user build on non-Linux
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -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 |