diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-04-01 13:35:36 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-04-01 13:35:37 +0100 |
| commit | 00084bab87c43be20638de7f191d1a1faed134cc (patch) | |
| tree | 3afd5f98907c4235cfc595ab4a1960d2f6a03a6c /migration/meson.build | |
| parent | 1bd16067b652cce41a9214d0c62c73d5b45ab4b1 (diff) | |
| parent | c81cfb89bc440466c1f128b64a8fbca256477b60 (diff) | |
| download | qemu-00084bab87c43be20638de7f191d1a1faed134cc.zip | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
* Bugfixes
* Code of conduct and conflict resolution policy
# gpg: Signature made Thu 01 Apr 2021 12:21:10 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
* remotes/bonzini-gitlab/tags/for-upstream:
docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document
hexagon: do not specify Python scripts as inputs
hexagon: do not specify executables as inputs
configure: Do not use default_feature for EXESUF
target/openrisc: fix icount handling for timer instructions
replay: notify CPU on event
icount: get rid of static variable
Revert "qom: use qemu_printf to print help for user-creatable objects"
replay: fix recursive checkpoints
qapi: qom: do not use target-specific conditionals
target/i386: Verify memory operand for lcall and ljmp
meson: Propagate gnutls dependency to migration
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/meson.build')
| -rw-r--r-- | migration/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/migration/meson.build b/migration/meson.build index 9645f44005..6fa2f8745d 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -24,7 +24,7 @@ softmmu_ss.add(files( 'savevm.c', 'socket.c', 'tls.c', -)) +), gnutls) softmmu_ss.add(when: ['CONFIG_RDMA', rdma], if_true: files('rdma.c')) softmmu_ss.add(when: 'CONFIG_LIVE_BLOCK_MIGRATION', if_true: files('block.c')) |