On Fri, Dec 20, 2019 at 06:24:43PM +0000, Peter Maydell wrote: > On Thu, 19 Dec 2019 at 13:27, Michael S. Tsirkin <m...@redhat.com> wrote: > > > > The following changes since commit b0ca999a43a22b38158a222233d3f5881648bb4f: > > > > Update version for v4.2.0 release (2019-12-12 16:45:57 +0000) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > > > for you to fetch changes up to d4fbea918a37c0586f1a0e15ac6ef04c9fc7b96b: > > > > vhost-user-scsi: reset the device if supported (2019-12-19 08:25:35 -0500) > > > > ---------------------------------------------------------------- > > virtio, pci, pc: fixes, features > > > > Bugfixes all over the place. > > HMAT support. > > New flags for vhost-user-blk utility. > > > > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> > > > > Compile failure on OSX: > /Users/pm215/src/qemu-for-merges/hw/core/numa.c:427:20: error: format > specifies type 'unsigned char' but the argument has type 'int' > [-Werror,-Wformat] > node->level - 1); > ~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ > /Users/pm215/src/qemu-for-merges/include/qapi/error.h:166:35: note: > expanded from macro 'error_setg' > (fmt), ## __VA_ARGS__) > ^~~~~~~~~~~ > /Users/pm215/src/qemu-for-merges/hw/core/numa.c:440:20: error: format > specifies type 'unsigned char' but the argument has type 'int' > [-Werror,-Wformat] > node->level + 1); > ~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~ > /Users/pm215/src/qemu-for-merges/include/qapi/error.h:166:35: note: > expanded from macro 'error_setg' > (fmt), ## __VA_ARGS__) > ^~~~~~~~~~~ > 2 errors generated. > > thanks > -- PMM
I think I fixed this up, can you try again with new for_upstream at cd8b62554728373e3dcdbc450a3d76a9ce4e7beb please?
