diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-04-14 20:09:52 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-04-14 20:09:52 +0100 |
| commit | 2f7cc1fbd6f6655d900ca7f45973b9bd5330c6dd (patch) | |
| tree | 4633575d26e5167d38805bd5a0188603723e0f5e /tests | |
| parent | a457215ed2aaa9598bd4ebbc6745d2a494ba9990 (diff) | |
| parent | 9f5a0664187e9411c5c6b7dbd21a1f50922cf698 (diff) | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
Bugfixes, and reworking of the atomics documentation.
# gpg: Signature made Tue 14 Apr 2020 15:38:01 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/tags/for-upstream:
hax: Windows doesn't like posix device names
tests: numa: test one backend with prealloc enabled
hostmem: set default prealloc_threads to valid value
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qtest/numa-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c index 2f9b7f663a..e1ed6d4322 100644 --- a/tests/qtest/numa-test.c +++ b/tests/qtest/numa-test.c @@ -455,7 +455,7 @@ static void pc_hmat_off_cfg(const void *data) cli = make_cli(data, "-nodefaults --preconfig " "-smp 2,sockets=2 " "-m 128M,slots=2,maxmem=1G " - "-object memory-backend-ram,size=64M,id=m0 " + "-object memory-backend-ram,size=64M,id=m0,prealloc=y " "-object memory-backend-ram,size=64M,id=m1 " "-numa node,nodeid=0,memdev=m0"); qs = qtest_init(cli); |