diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-08-22 13:13:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-08-22 13:13:35 +0100 |
| commit | 810923480863c43ecb22ae124156298385439339 (patch) | |
| tree | 786989fcc3da6a00bcabd53b9289bffcc2c0f55b /scripts/minikconf.py | |
| parent | f3b8f18ebf344ab359e8f79f6ed777e740dae77c (diff) | |
| parent | 78d01598aea85841f0e4f8baf62c42b76230a81c (diff) | |
| download | qemu-810923480863c43ecb22ae124156298385439339.zip qemu-810923480863c43ecb22ae124156298385439339.tar.gz qemu-810923480863c43ecb22ae124156298385439339.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* Longstanding chardev race condition fix (Berto)
* Cleanups and tests from the Meson POC (Marc-André, myself)
* Coalesced range cleanup (Peter)
# gpg: Signature made Wed 21 Aug 2019 18:27:43 BST
# gpg: using RSA key BFFBD25F78C7AE83
# 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/tags/for-upstream:
char-socket: Lock tcp_chr_disconnect() and socket_reconnect_timeout()
main-loop: Fix GSource leak in qio_task_thread_worker()
memory: Fix up memory_region_{add|del}_coalescing
memory: Remove has_coalesced_range counter
memory: Split zones when do coalesced_io_del()
memory: Refactor memory_region_clear_coalescing
minikconf: don't print CONFIG_FOO=n lines
configure: remove AUTOCONF_HOST
tests: add module loading test
module: return success on module load
module: use g_hash_table_add()
configure: define CONFIG_TOOLS here
qemu-ga: clean up TOOLS variable
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/minikconf.py')
| -rw-r--r-- | scripts/minikconf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/minikconf.py b/scripts/minikconf.py index 3109a81..40ae198 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -702,8 +702,8 @@ if __name__ == '__main__': config = data.compute_config() for key in sorted(config.keys()): - if key not in external_vars: - print ('CONFIG_%s=%s' % (key, ('y' if config[key] else 'n'))) + if key not in external_vars and config[key]: + print ('CONFIG_%s=y' % key) deps = open(argv[2], 'w') for fname in data.previously_included: |