mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixes, and reworking of the atomics documentation.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAl6VyskUHHBib256aW5p
 QHJlZGhhdC5jb20ACgkQv/vSX3jHroOQSwf9Gdw54Or8ziw/P1GhwnrZSBqDZ3hj
 a2kVukbCeTPUFdGLVpvuBb+xXpjyR+ixzyfBgUu87lJuJuTPB01UUfozt9PsQyWG
 4eMFXbuS/ofC3SNsnzuZIZ58BPG4MYiXXTYZgLxaWaePlIVkYKNQgK0yCIDzh566
 f8cMRhpxMQQBzW1vAnKnOzfo29ilEpPDyUWCy18BRuFuqAD7X8OxFxPnQ2DuHXHf
 ZU39fFFiiiAW8ro4d3DvsVVpLu7M0XxkoIwieLE/pJH0am8FDYIQw9XHV76f6mFZ
 dKZZkA8kg1OeE7jOF3ovWZI+JP5jwh0nSZBC01xZ9I8ZbPCjl7GD8hAfAA==
 =CQCd
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2020-04-14 20:09:52 +01:00
commit 2f7cc1fbd6
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backends/hostmem.c
View File

@ -280,6 +280,7 @@ static void host_memory_backend_init(Object *obj)
/* TODO: convert access to globals to compat properties */ /* TODO: convert access to globals to compat properties */
backend->merge = machine_mem_merge(machine); backend->merge = machine_mem_merge(machine);
backend->dump = machine_dump_guest_core(machine); backend->dump = machine_dump_guest_core(machine);
backend->prealloc_threads = 1;
} }
static void host_memory_backend_post_init(Object *obj) static void host_memory_backend_post_init(Object *obj)

4
target/i386/hax-windows.c
View File

@ -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) 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) 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) int hax_host_create_vm(struct hax_state *hax, int *vmid)

2
tests/qtest/numa-test.c
View File

@ -455,7 +455,7 @@ static void pc_hmat_off_cfg(const void *data)
cli = make_cli(data, "-nodefaults --preconfig " cli = make_cli(data, "-nodefaults --preconfig "
"-smp 2,sockets=2 " "-smp 2,sockets=2 "
"-m 128M,slots=2,maxmem=1G " "-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 " "-object memory-backend-ram,size=64M,id=m1 "
"-numa node,nodeid=0,memdev=m0"); "-numa node,nodeid=0,memdev=m0");
qs = qtest_init(cli); qs = qtest_init(cli);