jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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>

Peter Maydell 2f7cc1fb a457215e

+4 -3
+1
backends/hostmem.c
··· 280 280 /* TODO: convert access to globals to compat properties */ 281 281 backend->merge = machine_mem_merge(machine); 282 282 backend->dump = machine_dump_guest_core(machine); 283 + backend->prealloc_threads = 1; 283 284 } 284 285 285 286 static void host_memory_backend_post_init(Object *obj)
+2 -2
target/i386/hax-windows.c
··· 185 185 186 186 static char *hax_vm_devfs_string(int vm_id) 187 187 { 188 - return g_strdup_printf("/dev/hax_vm/vm%02d", vm_id); 188 + return g_strdup_printf("\\\\.\\hax_vm%02d", vm_id); 189 189 } 190 190 191 191 static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id) 192 192 { 193 - return g_strdup_printf("/dev/hax_vm%02d/vcpu%02d", vm_id, vcpu_id); 193 + return g_strdup_printf("\\\\.\\hax_vm%02d_vcpu%02d", vm_id, vcpu_id); 194 194 } 195 195 196 196 int hax_host_create_vm(struct hax_state *hax, int *vmid)
+1 -1
tests/qtest/numa-test.c
··· 455 455 cli = make_cli(data, "-nodefaults --preconfig " 456 456 "-smp 2,sockets=2 " 457 457 "-m 128M,slots=2,maxmem=1G " 458 - "-object memory-backend-ram,size=64M,id=m0 " 458 + "-object memory-backend-ram,size=64M,id=m0,prealloc=y " 459 459 "-object memory-backend-ram,size=64M,id=m1 " 460 460 "-numa node,nodeid=0,memdev=m0"); 461 461 qs = qtest_init(cli);