[PULL 0/3] More misc patches for QEMU 5.0-rc3

[PULL 0/3] More misc patches for QEMU 5.0-rc3

[Paolo Bonzini]

The following changes since commit 267514b33ffa3f315adc26fc14d89f92e90840f5:

  module: increase dirs array size by one (2020-04-13 02:56:18 -0400)

are available in the Git repository at:

  git://github.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 9f5a0664187e9411c5c6b7dbd21a1f50922cf698:

  hax: Windows doesn't like posix device names (2020-04-14 10:37:42 -0400)

----------------------------------------------------------------
Bugfixes, and reworking of the atomics documentation.

----------------------------------------------------------------
Igor Mammedov (2):
      hostmem: set default prealloc_threads to valid value
      tests: numa: test one backend with prealloc enabled

Volker Rümelin (1):
      hax: Windows doesn't like posix device names

 backends/hostmem.c        | 1 +
 target/i386/hax-windows.c | 4 ++--
 tests/qtest/numa-test.c   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
-- 
2.18.2

[PULL 1/3] hostmem: set default prealloc_threads to valid value

[Paolo Bonzini]

From: Igor Mammedov <imammedo@redhat.com>

Commit 4ebc74dbbf removed default prealloc_threads initialization
by mistake, and that makes QEMU crash with division on zero at
  numpages_per_thread = numpages / memset_num_threads;
when QEMU is started with following backend
  -object memory-backend-ram,id=ram-node0,prealloc=yes,size=128M

Return back initialization removed by 4ebc74dbbf to fix issue.

Fixes: 4ebc74dbbf7ad50e4101629f3f5da5fdc1544051
Reported-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20200325094423.24293-2-imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 backends/hostmem.c | 1 +
 1 file changed, 1 insertion(+)

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)
-- 
2.18.2

[PULL 2/3] tests: numa: test one backend with prealloc enabled

[Paolo Bonzini]

From: Igor Mammedov <imammedo@redhat.com>

Cannibalize one backend in the HMAT test to make sure that
prealloc=y is tested.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20200325094423.24293-3-imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/qtest/numa-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
2.18.2

[PULL 3/3] hax: Windows doesn't like posix device names

[Paolo Bonzini]

From: Volker Rümelin <vr_qemu@t-online.de>

Patch acb9f95a7c "i386: Fix GCC warning with snprintf when HAX
is enabled" replaced Windows device names with posix device
names. Revert this.

Fixes: acb9f95a7c "i386: Fix GCC warning with snprintf when HAX is enabled"

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-Id: <20200322210211.29603-1-vr_qemu@t-online.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 target/i386/hax-windows.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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)
-- 
2.18.2

Re: [PULL 0/3] More misc patches for QEMU 5.0-rc3

[Peter Maydell]

On Tue, 14 Apr 2020 at 17:40, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 267514b33ffa3f315adc26fc14d89f92e90840f5:
>
>   module: increase dirs array size by one (2020-04-13 02:56:18 -0400)
>
> are available in the Git repository at:
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 9f5a0664187e9411c5c6b7dbd21a1f50922cf698:
>
>   hax: Windows doesn't like posix device names (2020-04-14 10:37:42 -0400)
>
> ----------------------------------------------------------------
> Bugfixes, and reworking of the atomics documentation.
>
> ----------------------------------------------------------------
> Igor Mammedov (2):
>       hostmem: set default prealloc_threads to valid value
>       tests: numa: test one backend with prealloc enabled
>
> Volker Rümelin (1):
>       hax: Windows doesn't like posix device names


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.

-- PMM