* Peter Maydell (peter.mayd...@linaro.org) wrote: > On Tue, 11 May 2021 at 16:08, Dr. David Alan Gilbert (git) > <dgilb...@redhat.com> wrote: > > > > From: "Dr. David Alan Gilbert" <dgilb...@redhat.com> > > > > The following changes since commit e4f3ede95ce813d5705c65e1c0e1c80c70739ebb: > > > > Merge remote-tracking branch > > 'remotes/kraxel/tags/usb-20210505-pull-request' into staging (2021-05-10 > > 19:55:06 +0100) > > > > are available in the Git repository at: > > > > git://github.com/dagrh/qemu.git tags/pull-migration-20210511a > > > > for you to fetch changes up to 872df23afc70985af5a458e0c4bd2b984559015c: > > > > tests/migration: introduce multifd into guestperf (2021-05-11 11:26:19 > > +0100) > > > > ---------------------------------------------------------------- > > Migration pull 2021-05-11 > > > > The largest change in this set is David's changes for ram block size > > changing; then there's a pile of other cleanups and fixes. > > > > Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > > > > Fails to build on the gitlab cross build job: > https://gitlab.com/qemu-project/qemu/-/jobs/1258047823 > > ../migration/ram.c: In function 'host_page_from_ram_block_offset': > ../migration/ram.c:3092:12: error: cast to pointer from integer of > different size [-Werror=int-to-pointer-cast] > return (void *)QEMU_ALIGN_DOWN((uintptr_t)block->host + offset, > ^
OK, resent with a pair of brackets around the (block->host + offset), so that the result ends up as the uintptr_t. Seems to work for me in the docker test that otherwise failed. Dave > > thanks > -- PMM > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK