Commit Graph

2 Commits

Author SHA1 Message Date
espes ff3f9be0e2 Merge tag 'v1.6.0' into xbox
Conflicts:
	block/Makefile.objs
	configure
	hw/Makefile.objs
	hw/audio/ac97.c
	hw/i386/Makefile.objs
	hw/ide/core.c
	ui/console.c
2013-08-19 22:46:10 +10:00
Paolo Bonzini 0d09e41a51 hw: move headers to include/
Many of these should be cleaned up with proper qdev-/QOM-ification.
Right now there are many catch-all headers in include/hw/ARCH depending
on cpu.h, and this makes it necessary to compile these files per-target.
However, fixing this does not belong in these patches.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2013-04-08 18:13:10 +02:00