This is to fix few issues discovered while adding NVDIMM hot-add
support to arm/virt. These were previously part of [1] and since
the fixes are generic in nature and might be an issue in x86 as
well, they are being treated separately now.

1. https://patchwork.kernel.org/cover/11432383/

Updates:
 -Added R-by and A-by tags.
 -Edited commit log for patch#2
 -Updated patch#3 as per David's comment

David Hildenbrand (1):
  exec: Fix for qemu_ram_resize() callback

Shameer Kolothum (2):
  acpi: Use macro for table-loader file name
  fw_cfg: Migrate ACPI table mr sizes separately

 exec.c                      | 16 ++++++-
 hw/arm/virt-acpi-build.c    |  2 +-
 hw/core/machine.c           |  1 +
 hw/i386/acpi-build.c        |  2 +-
 hw/nvram/fw_cfg.c           | 86 ++++++++++++++++++++++++++++++++++++-
 include/hw/acpi/aml-build.h |  1 +
 include/hw/nvram/fw_cfg.h   |  6 +++
 7 files changed, 109 insertions(+), 5 deletions(-)

-- 
2.17.1

Patchew URL: https://patchew.org/QEMU/20200330164909.28324-1-shameerali.kolothum.thodi@huawei.com/



Hi,

This series failed the docker-mingw@fedora build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

=== TEST SCRIPT BEGIN ===
#! /bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-mingw@fedora J=14 NETWORK=1
=== TEST SCRIPT END ===

  CC      hw/smbios/smbios.o
In file included from /tmp/qemu-test/src/include/qemu/osdep.h:51,
                 from /tmp/qemu-test/src/hw/nvram/fw_cfg.c:25:
/tmp/qemu-test/src/include/qemu/compiler.h:81:35: error: invalid operands to binary - (have 'uint64_t *' {aka 'long long unsigned int *'} and 'size_t *' {aka 'unsigned int *'})
 #define type_check(t1,t2) ((t1*)0 - (t2*)0)
                                   ^
/tmp/qemu-test/src/include/migration/vmstate.h:254:6: note: in expansion of macro 'type_check'
---
/tmp/qemu-test/src/hw/nvram/fw_cfg.c:674:9: note: in expansion of macro 'VMSTATE_UINT64'
         VMSTATE_UINT64(table_mr_size, FWCfgState),
         ^~~~~~~~~~~~~~
/tmp/qemu-test/src/include/qemu/compiler.h:81:35: error: invalid operands to binary - (have 'uint64_t *' {aka 'long long unsigned int *'} and 'size_t *' {aka 'unsigned int *'})
 #define type_check(t1,t2) ((t1*)0 - (t2*)0)
                                   ^
/tmp/qemu-test/src/include/migration/vmstate.h:254:6: note: in expansion of macro 'type_check'
---
/tmp/qemu-test/src/hw/nvram/fw_cfg.c:675:9: note: in expansion of macro 'VMSTATE_UINT64'
         VMSTATE_UINT64(linker_mr_size, FWCfgState),
         ^~~~~~~~~~~~~~
/tmp/qemu-test/src/include/qemu/compiler.h:81:35: error: invalid operands to binary - (have 'uint64_t *' {aka 'long long unsigned int *'} and 'size_t *' {aka 'unsigned int *'})
 #define type_check(t1,t2) ((t1*)0 - (t2*)0)
                                   ^
/tmp/qemu-test/src/include/migration/vmstate.h:254:6: note: in expansion of macro 'type_check'
---
/tmp/qemu-test/src/hw/nvram/fw_cfg.c:676:9: note: in expansion of macro 'VMSTATE_UINT64'
         VMSTATE_UINT64(rsdp_mr_size, FWCfgState),
         ^~~~~~~~~~~~~~
make: *** [/tmp/qemu-test/src/rules.mak:69: hw/nvram/fw_cfg.o] Error 1
make: *** Waiting for unfinished jobs....
Traceback (most recent call last):
  File "./tests/docker/docker.py", line 664, in <module>
---
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=e975dafce18c4d8d8bdc1aeccfe2c3fe', '-u', '1001', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-d8s6cyrl/src/docker-src.2020-03-30-15.54.26.3049:/var/tmp/qemu:z,ro', 'qemu:fedora', '/var/tmp/qemu/run', 'test-mingw']' returned non-zero exit status 2.
filter=--filter=label=com.qemu.instance.uuid=e975dafce18c4d8d8bdc1aeccfe2c3fe
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-d8s6cyrl/src'
make: *** [docker-run-test-mingw@fedora] Error 2

real    5m22.202s
user    0m8.599s


The full log is available at
http://patchew.org/logs/20200330164909.28324-1-shameerali.kolothum.thodi@huawei.com/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com