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

..

cpu.h

Merge branch 'icount-update' into HEAD

2017-03-03 16:39:18 +01:00

object_interfaces.h

monitor: reuse user_creatable_add_opts() instead of user_creatable_add()

2017-01-12 15:34:47 -02:00

object.h

object: make some funcs static

2017-01-24 23:26:53 +03:00

qom-qobject.h

qom: move include files to include/qom/

2012-12-19 08:31:32 +01:00