On Mon, Jan 06, 2020 at 04:48:19PM +0000, Peter Maydell wrote: > On Sun, 5 Jan 2020 at 12:57, Michael S. Tsirkin <m...@redhat.com> wrote: > > > > Changes from v2: > > - rebased on master > > - a couple more bugfixes > > > > The following changes since commit f0dcfddecee8b860e015bb07d67cfcbdfbfd51d9: > > > > Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' > > into staging (2020-01-03 17:18:08 +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 93ef96f3258f489f7bff28ca7b9e0dc74de2a75b: > > > > intel_iommu: add present bit check for pasid table entries (2020-01-05 > > 07:41:10 -0500) > > > > ---------------------------------------------------------------- > > virtio, pci, pc: fixes, features > > > > Bugfixes all over the place. > > HMAT support. > > New flags for vhost-user-blk utility. > > Auto-tuning of seg max for virtio storage. > > > > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> > > Build failure for OSX: > > /Users/pm215/src/qemu-for-merges/hw/scsi/virtio-scsi.c:904:35: error: > format specifies type 'unsigned short' but the argument has type > 'uint32_t' (aka 'unsigned int') [-Werror,-Wformat] > "must be > 2", s->conf.virtqueue_size); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~ > /Users/pm215/src/qemu-for-merges/include/qapi/error.h:166:35: note: > expanded from macro 'error_setg' > (fmt), ## __VA_ARGS__) > ^~~~~~~~~~~ > 1 error generated. > > (Everything else passed OK.) > > thanks > -- PMM
Fixed up now - can you try again pls? -- MST