On Tue, Mar 03, 2015 at 11:37:27PM +0900, Peter Maydell wrote: > On 27 February 2015 at 01:59, Michael S. Tsirkin <m...@redhat.com> wrote: > > Exactly the same thing as v1 but rebased to master to > > help Peter resolve conflicts, so I'm not bothering > > with resending all patches. > > > > A huge patchset, but the scariest part is Igor's patches, > > and these have been used by multiple people by now. > > virtio header change is a bit rushed, but getting them upstream > > seems like the best way to give them the cross-platform > > testing that they need, and this takes us a step closer to > > virtio-1.0 support. > > > > The following changes since commit 11d39a131020cc5c54ff9bc86d3259f7d32bf849: > > > > Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20150218' > > into staging (2015-02-26 09:08:54 +0000) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git > > tags/for_upstream_rebased > > > > for you to fetch changes up to dc33c0293505db9c747a6e27487a808ab2b62a6f: > > > > acpi-test: update expected files (2015-02-26 13:04:19 +0100) > > > > ---------------------------------------------------------------- > > pci, pc, virtio fixes and cleanups > > > > Last large pull for soft freeze. > > > > A bunch of fixes all over the place. > > Most of ACPI refactoring has been merged. > > > > virtio header cleanup has been merged, > > now that windows has been build-tested with it. > > > > initial patches from virtio-1.0 branch have been merged. > > > > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> > > > > ---------------------------------------------------------------- > > Doesn't build with our minimum glib requirement, I'm afraid: > > /home/petmay01/linaro/qemu-for-merges/hw/acpi/aml-build.c:313: > undefined reference to `g_ptr_array_new_with_free_func' > > (that function only appeared in glib 2.22.) > > -- PMM
I fixed that, PULL v4 is out. Sorry about all the noise. -- MST
