Merge commit '
a4673e276248ada38f40d39191a197e7e35d3f8b' into upstream-merge
* commit '
a4673e276248ada38f40d39191a197e7e35d3f8b': (24 commits)
OHCI address decoding fix
Move stdbool.h
monitor/QMP: Drop info hpet / query-hpet
hpet: Add MSI support
hpet: Make number of timers configurable
vmstate: Add VMSTATE_STRUCT_VARRAY_UINT8
hpet: Add support for level-triggered interrupts
hpet: Drop static state
hpet/rtc: Rework RTC IRQ replacement by HPET
hpet: Start/stop timer when HPET_TN_ENABLE is modified
hpet: Convert to qdev
hpet: Move static timer field initialization
hpet: Silence warning on write to running main counter
hxtool: Fix line number reporting on SQMP/EQMP errors
remove unnecessary lookaheads
implement optional lookahead in json lexer
add some tests for invalid JSON
json-streamer: Don't use qdict_put_obj()
json-lexer: Drop 'buf'
check-qjson: Add more escape tests
...
Conflicts:
hw/hpet.c
Signed-off-by: Avi Kivity <avi@redhat.com>