diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-15 13:07:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-15 13:07:08 +0000 |
| commit | 926e368388420a9728de1e31528ba48e7e8029b3 (patch) | |
| tree | 543375c01001d92f838f2a7d329cd35d50b3243f /trace/control-internal.h | |
| parent | d84f714eafedd8bb9d4aaec8b76417bef8e3535e (diff) | |
| parent | 0bcba41fe379e4c6834adcf1456d9099db31a5b2 (diff) | |
| download | qemu-926e368388420a9728de1e31528ba48e7e8029b3.zip qemu-926e368388420a9728de1e31528ba48e7e8029b3.tar.gz qemu-926e368388420a9728de1e31528ba48e7e8029b3.tar.bz2 | |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging
Fix global property and -cpu handling bug
This bug fix was supposed to be applied just after 2.8.0 was
released, but it slipped through the cracks. Sending it now for
the next -rc.
# gpg: Signature made Tue 14 Mar 2017 20:04:50 GMT
# gpg: using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/machine-pull-request:
machine: Convert abstract typename on compat_props to subclass names
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'trace/control-internal.h')
0 files changed, 0 insertions, 0 deletions