Re: [Qemu-devel] [PULL 00/96] pci, pc, virtio fixes and cleanups

[Michael S. Tsirkin]

On Thu, Feb 26, 2015 at 08:17:43PM +0900, Peter Maydell wrote:
> On 19 February 2015 at 06:43, Michael S. Tsirkin <address@hidden> wrote:
> > 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 cd2d5541271f1934345d8ca42f5fafff1744eee7:
> >
> >   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150212' into 
> > staging (2015-02-13 11:44:50 +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 6b5e5a8361bdff0e75629b1001236d78f27676b6:
> >
> >   acpi-test: update expected files (2015-02-18 22:29:26 +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 <address@hidden>
> >
> > ----------------------------------------------------------------
> 
> Hi. I'm afraid this fails to build:
> 
>   CP i386-softmmu/hw/i386/acpi-dsdt.hex
>   CP i386-softmmu/hw/i386/q35-acpi-dsdt.hex
> make[1]: *** No rule to make target
> `/home/petmay01/linaro/qemu-for-merges/hw/i386/ssdt-proc.dsl', needed
> by `hw/i386/ssdt-proc.hex'.  Stop.
> make[1]: *** Waiting for unfinished jobs....

Are you sure it's a clean build?
This often results from a stale .d file.

> (There were also a bunch of conflicts in the virtio
> stuff which you'll need to fix up when you rebase.)
> 
> thanks
> -- PMM