From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecWWc-0006EX-Le for qemu-devel@nongnu.org; Fri, 19 Jan 2018 08:16:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecWWb-0008Er-CT for qemu-devel@nongnu.org; Fri, 19 Jan 2018 08:16:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56908) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ecWWb-0008Ei-5o for qemu-devel@nongnu.org; Fri, 19 Jan 2018 08:16:05 -0500 Date: Fri, 19 Jan 2018 11:15:58 -0200 From: Eduardo Habkost Message-ID: <20180119131558.GS5292@localhost.localdomain> References: <20180118021000.27203-1-ehabkost@redhat.com> <20180118212023.GH5292@localhost.localdomain> <20180119004728.ptmqdwdazens4dhv@hz-desktop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180119004728.ptmqdwdazens4dhv@hz-desktop> Subject: Re: [Qemu-devel] [PULL 00/19] machine queue, 2018-01-18 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , QEMU Developers , Marcel Apfelbaum On Fri, Jan 19, 2018 at 08:47:28AM +0800, Haozhong Zhang wrote: > On 01/18/18 19:20 -0200, Eduardo Habkost wrote: > > On Thu, Jan 18, 2018 at 03:22:05PM +0000, Peter Maydell wrote: > > > On 18 January 2018 at 02:09, Eduardo Habkost wrote: > > > > The following changes since commit 8e5dc9ba49743b46d955ec7dacb04e42ae7ada7c: > > > > > > > > Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180116' into staging (2018-01-16 17:36:39 +0000) > > > > > > > > are available in the Git repository at: > > > > > > > > git://github.com/ehabkost/qemu.git tags/machine-next-pull-request > > > > > > > > for you to fetch changes up to 901cc8d31f36ac82824ab68f656ab7050404100c: > > > > > > > > fw_cfg: fix memory corruption when all fw_cfg slots are used (2018-01-17 23:04:37 -0200) > > > > > > > > ---------------------------------------------------------------- > > > > machine queue, 2018-01-18 > > > > > > > > ---------------------------------------------------------------- > > > > > > Hi. I'm afraid this doesn't build on 32-bit hosts, due to a > > > format string problem: > > > > > > In file included from /home/peter.maydell/qemu/exec.c:20:0: > > > /home/peter.maydell/qemu/exec.c: In function 'file_ram_alloc': > > > /home/peter.maydell/qemu/include/qapi/error.h:162:25: error: format > > > '%llx' expects argument of type 'long long unsigned int', but argument > > > 7 has type 'size_t {aka unsigned int}' [-Werror=format=] > > > (fmt), ## __VA_ARGS__) > > > ^ > > > /home/peter.maydell/qemu/exec.c:1616:9: note: in expansion of macro 'error_setg' > > > error_setg(errp, "aligment 0x%" PRIx64 > > > ^ > > > > Sorry for not catching this. Fixup will be included on a new > > pull request: > > > > diff --git a/exec.c b/exec.c > > index 00055559b8..7bba8ef4ab 100644 > > --- a/exec.c > > +++ b/exec.c > > @@ -1613,8 +1613,8 @@ static void *file_ram_alloc(RAMBlock *block, > > > > block->page_size = qemu_fd_getpagesize(fd); > > if (block->mr->align % block->page_size) { > > - error_setg(errp, "aligment 0x%" PRIx64 > > - " must be multiples of page size 0x%" PRIx64, > > + error_setg(errp, "alignment 0x%" PRIx64 > > + " must be multiples of page size 0x%zd", > ^^^^^^ 0x%zx, or remove the prefix '0x' Oops. Luckily the pull request wasn't submitted yet. -- Eduardo