Paolo Bonzini 30f3dda24b Merge branch 'icount-update' into HEAD ... Merge the original development branch due to breakage caused by the MTTCG merge. Conflicts: cpu-exec.c translate-common.c Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>		2017-03-03 16:39:18 +01:00
..
container.c	qom: Clean up includes	2016-02-04 17:41:30 +00:00
cpu.c	Merge branch 'icount-update' into HEAD	2017-03-03 16:39:18 +01:00
Makefile.objs	qom: allow QOM to be linked into tools binaries	2015-09-15 14:35:39 +01:00
object_interfaces.c	monitor: fix qmp/hmp query-memdev not reporting IDs of memory backends	2017-01-12 15:35:06 -02:00
object.c	object: make some funcs static	2017-01-24 23:26:53 +03:00
qom-qobject.c	qapi: rename QmpOutputVisitor to QObjectOutputVisitor	2016-10-25 16:25:54 +02:00
trace-events	trace-events: fix first line comment in trace-events	2016-08-12 10:36:01 +01:00