diff options
| author | Peter Maydell | 2020-04-14 21:09:52 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-04-14 21:09:52 +0200 |
| commit | 2f7cc1fbd6f6655d900ca7f45973b9bd5330c6dd (patch) | |
| tree | 4633575d26e5167d38805bd5a0188603723e0f5e | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200414'... (diff) | |
| parent | hax: Windows doesn't like posix device names (diff) | |
| download | qemu-2f7cc1fbd6f6655d900ca7f45973b9bd5330c6dd.tar.gz qemu-2f7cc1fbd6f6655d900ca7f45973b9bd5330c6dd.tar.xz qemu-2f7cc1fbd6f6655d900ca7f45973b9bd5330c6dd.zip | |
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>
| -rw-r--r-- | backends/hostmem.c | 1 | ||||
| -rw-r--r-- | target/i386/hax-windows.c | 4 | ||||
| -rw-r--r-- | tests/qtest/numa-test.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/backends/hostmem.c b/backends/hostmem.c index a70867b255..327f9eebc3 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -280,6 +280,7 @@ static void host_memory_backend_init(Object *obj) /* TODO: convert access to globals to compat properties */ backend->merge = machine_mem_merge(machine); backend->dump = machine_dump_guest_core(machine); + backend->prealloc_threads = 1; } static void host_memory_backend_post_init(Object *obj) diff --git a/target/i386/hax-windows.c b/target/i386/hax-windows.c index 0ba488c468..863c2bcc19 100644 --- a/target/i386/hax-windows.c +++ b/target/i386/hax-windows.c @@ -185,12 +185,12 @@ int hax_mod_version(struct hax_state *hax, struct hax_module_version *version) static char *hax_vm_devfs_string(int vm_id) { - return g_strdup_printf("/dev/hax_vm/vm%02d", vm_id); + return g_strdup_printf("\\\\.\\hax_vm%02d", vm_id); } static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id) { - return g_strdup_printf("/dev/hax_vm%02d/vcpu%02d", vm_id, vcpu_id); + return g_strdup_printf("\\\\.\\hax_vm%02d_vcpu%02d", vm_id, vcpu_id); } int hax_host_create_vm(struct hax_state *hax, int *vmid) 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); |