Re: [Qemu-devel] [PULL v5] pci, pc, virtio fixes and cleanups

[Michael S. Tsirkin]

On Fri, Mar 06, 2015 at 03:27:07PM +0100, Markus Armbruster wrote:
> "Michael S. Tsirkin" <address@hidden> writes:
> 
> > Sorry about all the problems.
> > Same as v4, but updated generated files for non-iasl systems.
> > Not re-sending the patches therefore.
> >
> > 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
> >
> > for you to fetch changes up to 09d219a31cf87ed98150c0a9e772e54f470f2a01:
> >
> >   acpi: update generated files (2015-03-04 16:05:32 +0100)
> 
> I tried to base work on this branch, and ran into trouble:
> 
>     $ git-checkout master
>     error: The following untracked working tree files would be overwritten by 
> checkout:
>             hw/i386/acpi-dsdt-pci-crs.dsl
>             hw/i386/ssdt-mem.dsl
>             hw/i386/ssdt-mem.hex.generated
>             hw/i386/ssdt-misc.dsl
>             hw/i386/ssdt-misc.hex.generated
>             hw/i386/ssdt-pcihp.dsl
>             hw/i386/ssdt-pcihp.hex.generated
>             hw/i386/ssdt-proc.dsl
>             hw/i386/ssdt-proc.hex.generated
>             include/hw/virtio/virtio_ring.h
>             stubs/pci-drive-hot-add.c
>     Please move or remove them before you can switch branches.
>     Aborting
> 
> It looks like we now generate a bunch of files that used to be
> git-controlled.  The "generate" part is fine.  But generating into the
> source tree is asking for trouble.
>
> What happens when I build separate build trees in parallel?
> 
> Why is it a good idea to generate into the source tree instead of the
> build tree?

I don't know what you did that caused this.
This isn't what's going on AFAIK. There are no new generated files.

-- 
MST