It looks like this conflicts with commit 374f63f6810a ("Merge
remote-tracking branch 'remotes/armbru/tags/pull-monitor-2019-07-02-v2'
into staging"), and I'll have to manually fix the conflicts and
send a new pull request.
I've learned a lesson here: if queueing a series that touches too
many file
Changes v3 -> v4:
* Fix ppc64 "make check" failure
Changes v2 -> v3:
* Fix "make check" warnings (Igor Mammedov)
* Fix conflicts of "hw/arm: Replace global smp variables with
machine smp properties" with recent arm changes (Eduardo Habkost)
* x86 versioned CPU models (Eduardo Habkost)
* SnowRidg
